staging: sm750fb: fix 3 CamelCase variables
Subsystems (2)
cover staging: sm750fb: fix 3 CamelCase variables
This patchset renames 3 CamelCase variables in the sm750fb driver.
- pvMem -> vmem
- powerMode -> power_mode
- resetMemory -> reset_memory
No functional changes.
Jennifer Guo (2):
staging: sm750fb: rename CamelCase variable and drop prefix
staging: sm750fb: change 2 CamelCase variables to snake_case
drivers/staging/sm750fb/sm750.c | 22 +++++++++++----------- drivers/staging/sm750fb/sm750.h | 6 +++--- drivers/staging/sm750fb/sm750_hw.c | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/2 staging: sm750fb: rename CamelCase variable and drop prefix
Renames the CamelCase variable 'pvMem' in struct sm750_dev to 'vmem'. Dropping the pointer prefix 'p'.
This fixes the following checkpatch.pl check:
CHECK: Avoid CamelCase: <pvMem>
--- drivers/staging/sm750fb/sm750.c | 18 +++++++++--------- drivers/staging/sm750fb/sm750.h | 2 +- drivers/staging/sm750fb/sm750_hw.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)
drivers/staging/sm750fb/sm750.c +9 -9
@@ -622,26 +622,26 @@ 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->vmem;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->vmem;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->vmem; }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->vmem + crtc->o_screen; }break ;case sm750_dual_swap:
@@ -649,7 +649,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->vmem; }else { output->paths = sm750_crt; crtc->channel = sm750_primary;
@@ -657,7 +657,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->vmem + crtc->o_screen; }break ;default :
@@ -761,7 +761,7 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) 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->vmem + crtc->cursor.offset;memset_io (crtc->cursor.vstart,0 , crtc->cursor.size);if (!g_hwcursor)
@@ -1028,7 +1028,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->vmem,0 , sm750_dev->vidmem_size);pci_set_drvdata (pdev, sm750_dev);
@@ -1060,7 +1060,7 @@ static void lynxfb_pci_remove(struct pci_dev *pdev)arch_phys_wc_del (sm750_dev->mtrr.vram);iounmap (sm750_dev->pvReg); -iounmap (sm750_dev->pvMem); +iounmap (sm750_dev->vmem);pci_release_region (pdev,1 );kfree (g_settings); }
drivers/staging/sm750fb/sm750.h +1 -1
@@ -98,7 +98,7 @@ struct sm750_dev {__u32 vidmem_size;__u32 vidreg_size;void __iomem *pvReg; -unsigned char __iomem *pvMem; +unsigned char __iomem *vmem;/* locks*/ spinlock_t slock;
drivers/staging/sm750fb/sm750_hw.c +2 -2
@@ -66,9 +66,9 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) sm750_dev->vidmem_size =ddk750_get_vm_size ();/* reserve the vidmem space of smi adaptor */ - sm750_dev->pvMem = + sm750_dev->vmem =ioremap_wc (sm750_dev->vidmem_start, sm750_dev->vidmem_size); -if (!sm750_dev->pvMem) { +if (!sm750_dev->vmem) {dev_err (&pdev->dev,"Map video memory failed\n" ); ret = -EFAULT ; goto err_unmap_reg;
Signature · 1 line
2.34.1
PATCH 2/2 staging: sm750fb: change 2 CamelCase variables to snake_case
In reply to Jennifer GuoRenames these variables inside struct init_status to adhere to kernel coding style:
- powerMode -> power_mode
- resetMemory -> reset_memory
This fixes the following checkpatch.pl checks:
- CHECK: Avoid CamelCase: <powerMode>
- CHECK: Avoid CamelCase: <resetMemory>
--- drivers/staging/sm750fb/sm750.c | 4 ++-- drivers/staging/sm750fb/sm750.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/sm750fb/sm750.c +2 -2
@@ -859,9 +859,9 @@ static void sm750fb_setup(struct sm750_dev *sm750_dev, char *src) 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.powerMode =0 ; + sm750_dev->init_parm.power_mode =0 ; sm750_dev->init_parm.setAllEngOff =0 ; - sm750_dev->init_parm.resetMemory =1 ; + sm750_dev->init_parm.reset_memory =1 ;/* defaultly turn g_hwcursor on for both view */ g_hwcursor =3 ;
drivers/staging/sm750fb/sm750.h +2 -2
@@ -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 reset_memory; };struct lynx_accel {
Signature · 1 line
2.34.1