staging: sm750fb: fix CamelCase naming crimes
Subsystems (2)
PATCH 1/1 staging: sm750fb: fix CamelCase naming crimes
The sm750fb driver had several variables using CamelCase, which is discouraged in the Linux kernel coding style.
Rename the following variables to use snake_case:
- pvMem -> pv_mem
- pvReg -> pv_reg
- fixId -> fix_id
- initParm -> init_parm
- powerMode -> power_mode
- setAllEngOff -> set_all_eng_off
- resetMemory -> reset_memory
This improves readability and brings the driver closer to the official kernel coding standards.
--- drivers/staging/sm750fb/sm750.c | 38 +++++++++++++++--------------- drivers/staging/sm750fb/sm750.h | 12 +++++----- drivers/staging/sm750fb/sm750_hw.c | 24 +++++++++---------- 3 files changed, 37 insertions(+), 37 deletions(-)
drivers/staging/sm750fb/sm750.c +19 -19
@@ -624,27 +624,27 @@ static int sm750fb_set_drv(struct lynxfb_par *par) output->paths = sm750_pnc; crtc->channel = sm750_primary; crtc->o_screen =0 ; - crtc->v_screen = sm750_dev->pvMem; + crtc->v_screen = sm750_dev->pv_mem;pr_info ("use simul primary mode\n" );break ;case sm750_simul_sec: output->paths = sm750_pnc; crtc->channel = sm750_secondary; crtc->o_screen =0 ; - crtc->v_screen = sm750_dev->pvMem; + crtc->v_screen = sm750_dev->pv_mem;break ;case sm750_dual_normal:if (par->index ==0 ) { output->paths = sm750_panel; crtc->channel = sm750_primary; crtc->o_screen =0 ; - crtc->v_screen = sm750_dev->pvMem; + crtc->v_screen = sm750_dev->pv_mem; }else { output->paths = sm750_crt; crtc->channel = sm750_secondary;/* not consider of padding stuffs for o_screen,need fix */ crtc->o_screen = sm750_dev->vidmem_size >>1 ; - crtc->v_screen = sm750_dev->pvMem + crtc->o_screen; + crtc->v_screen = sm750_dev->pv_mem + crtc->o_screen; }break ;case sm750_dual_swap:
@@ -652,7 +652,7 @@ static int sm750fb_set_drv(struct lynxfb_par *par) output->paths = sm750_panel; crtc->channel = sm750_secondary; crtc->o_screen =0 ; - crtc->v_screen = sm750_dev->pvMem; + crtc->v_screen = sm750_dev->pv_mem; }else { output->paths = sm750_crt; crtc->channel = sm750_primary;
@@ -660,7 +660,7 @@ static int sm750fb_set_drv(struct lynxfb_par *par)* need fix */ crtc->o_screen = sm750_dev->vidmem_size >>1 ; - crtc->v_screen = sm750_dev->pvMem + crtc->o_screen; + crtc->v_screen = sm750_dev->pv_mem + crtc->o_screen; }break ;default :
@@ -740,7 +740,7 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) "kernel HELPERS prepared vesa_modes", }; -static const char *fixId[2 ] = { +static const char *fix_id[2 ] = {"sm750_fb1" ,"sm750_fb2" , };
@@ -764,14 +764,14 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)* must be set after crtc member initialized */ crtc->cursor.offset = crtc->o_screen + crtc->vidmem_size -1024 ; - crtc->cursor.mmio = sm750_dev->pvReg + + crtc->cursor.mmio = sm750_dev->pv_reg +0x800f0 + (int )crtc->channel *0x140 ;pr_info ("crtc->cursor.mmio = %p\n" , crtc->cursor.mmio); crtc->cursor.max_h =64 ; crtc->cursor.max_w =64 ; crtc->cursor.size = crtc->cursor.max_h * crtc->cursor.max_w *2 /8 ; - crtc->cursor.vstart = sm750_dev->pvMem + crtc->cursor.offset; + crtc->cursor.vstart = sm750_dev->pv_mem + crtc->cursor.offset;memset_io (crtc->cursor.vstart,0 , crtc->cursor.size);if (!g_hwcursor)
@@ -862,7 +862,7 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) fix->ywrapstep = crtc->ywrapstep; fix->accel =FB_ACCEL_SMI ; -strscpy (fix->id, fixId[index],sizeof (fix->id)); +strscpy (fix->id, fix_id[index],sizeof (fix->id)); fix->smem_start = crtc->o_screen + sm750_dev->vidmem_start;pr_info ("fix->smem_start = %lx\n" , fix->smem_start);
@@ -918,12 +918,12 @@ static void sm750fb_setup(struct sm750_dev *sm750_dev, char *src) swap =0 ; - sm750_dev->initParm.chip_clk =0 ; - sm750_dev->initParm.mem_clk =0 ; - sm750_dev->initParm.master_clk =0 ; - sm750_dev->initParm.powerMode =0 ; - sm750_dev->initParm.setAllEngOff =0 ; - sm750_dev->initParm.resetMemory =1 ; + sm750_dev->init_parm.chip_clk =0 ; + sm750_dev->init_parm.mem_clk =0 ; + sm750_dev->init_parm.master_clk =0 ; + sm750_dev->init_parm.power_mode =0 ; + sm750_dev->init_parm.set_all_eng_off =0 ; + sm750_dev->init_parm.reset_memory =1 ;/* defaultly turn g_hwcursor on for both view */ g_hwcursor =3 ;
@@ -1090,7 +1090,7 @@ static int lynxfb_pci_probe(struct pci_dev *pdev, sm750_dev->mtrr.vram =arch_phys_wc_add (sm750_dev->vidmem_start, sm750_dev->vidmem_size); -memset_io (sm750_dev->pvMem,0 , sm750_dev->vidmem_size); +memset_io (sm750_dev->pv_mem,0 , sm750_dev->vidmem_size);pci_set_drvdata (pdev, sm750_dev);
@@ -1121,8 +1121,8 @@ static void lynxfb_pci_remove(struct pci_dev *pdev)sm750fb_framebuffer_release (sm750_dev);arch_phys_wc_del (sm750_dev->mtrr.vram); -iounmap (sm750_dev->pvReg); -iounmap (sm750_dev->pvMem); +iounmap (sm750_dev->pv_reg); +iounmap (sm750_dev->pv_mem);kfree (g_settings); }
drivers/staging/sm750fb/sm750.h +6 -6
@@ -39,13 +39,13 @@ enum sm750_path { };struct init_status { -ushort powerMode; +ushort power_mode;/* below three clocks are in unit of MHZ*/ ushort chip_clk;ushort mem_clk;ushort master_clk; -ushort setAllEngOff; -ushort resetMemory; +ushort set_all_eng_off; +ushort reset_memory; };struct lynx_accel {
@@ -97,12 +97,12 @@ struct sm750_dev {unsigned long vidreg_start;__u32 vidmem_size;__u32 vidreg_size; -void __iomem *pvReg; -unsigned char __iomem *pvMem; +void __iomem *pv_reg; +unsigned char __iomem *pv_mem;/* locks*/ spinlock_t slock; -struct init_status initParm; +struct init_status init_parm;enum sm750_pnltype pnltype;enum sm750_dataflow dataflow;int nocrt;
drivers/staging/sm750fb/sm750_hw.c +12 -12
@@ -49,19 +49,19 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) }/* now map mmio and vidmem */ - sm750_dev->pvReg = + sm750_dev->pv_reg =ioremap (sm750_dev->vidreg_start, sm750_dev->vidreg_size); -if (!sm750_dev->pvReg) { +if (!sm750_dev->pv_reg) {pr_err ("mmio failed\n" ); ret = -EFAULT ; goto exit; } -pr_info ("mmio virtual addr = %p\n" , sm750_dev->pvReg); +pr_info ("mmio virtual addr = %p\n" , sm750_dev->pv_reg); - sm750_dev->accel.dpr_base = sm750_dev->pvReg +DE_BASE_ADDR_TYPE1 ; - sm750_dev->accel.dp_port_base = sm750_dev->pvReg +DE_PORT_ADDR_TYPE1 ; + sm750_dev->accel.dpr_base = sm750_dev->pv_reg +DE_BASE_ADDR_TYPE1 ; + sm750_dev->accel.dp_port_base = sm750_dev->pv_reg +DE_PORT_ADDR_TYPE1 ; - mmio750 = sm750_dev->pvReg; + mmio750 = sm750_dev->pv_reg;sm750_set_chip_type (sm750_dev->devid, sm750_dev->revid); sm750_dev->vidmem_start =pci_resource_start (pdev,0 );
@@ -76,15 +76,15 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) sm750_dev->vidmem_start, sm750_dev->vidmem_size);/* reserve the vidmem space of smi adaptor */ - sm750_dev->pvMem = + sm750_dev->pv_mem =ioremap_wc (sm750_dev->vidmem_start, sm750_dev->vidmem_size); -if (!sm750_dev->pvMem) { -iounmap (sm750_dev->pvReg); +if (!sm750_dev->pv_mem) { +iounmap (sm750_dev->pv_reg);pr_err ("Map video memory failed\n" ); ret = -EFAULT ; goto exit; } -pr_info ("video memory vaddr = %p\n" , sm750_dev->pvMem); +pr_info ("video memory vaddr = %p\n" , sm750_dev->pv_mem); exit:return ret; }
@@ -93,7 +93,7 @@ int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev) {struct init_status *parm; - parm = &sm750_dev->initParm; + parm = &sm750_dev->init_parm;if (parm->chip_clk ==0 ) parm->chip_clk = (sm750_get_chip_type () ==SM750LE ) ? DEFAULT_SM750LE_CHIP_CLOCK :
@@ -104,7 +104,7 @@ int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev)if (parm->master_clk ==0 ) parm->master_clk = parm->chip_clk /3 ; -ddk750_init_hw ((struct initchip_param *)&sm750_dev->initParm); +ddk750_init_hw ((struct initchip_param *)&sm750_dev->init_parm);/* for sm718, open pci burst */ if (sm750_dev->devid ==0x718 ) { poke32(SYSTEM_CTRL,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerQuoted 6 lines · Jad Keskes
The sm750fb driver had several variables using CamelCase, which is discouraged in the Linux kernel coding style.
Rename the following variables to use
snake_case:
- pvMem ->pv_mem
- pvReg ->pv_reg
Please look at these names, "pv" was trying to use "Hungarian notation" and describe a void pointer. That's not a proper way to name a kernel variable, so pick a correct one instead.
Also, it's usually best if you rename one structure at a time.
thanks,
greg k-h