staging: sm750fb: rename CamelCase variables to snake_case
PATCH 1/1 staging: sm750fb: rename CamelCase variables to snake_case
- pvMem -> p_mem
- pvReg -> p_reg
- powerMode -> power_mode
- setAllEngOff -> set_all_eng_off
- resetMemory -> reset_memory
- sm750_doubleTFT -> sm750_double_tft
- sm750_dualTFT -> sm750_dual_tft
Compile-tested only.
Signed-off-by Robert DeRienzo <[email protected]>
---
This is my first contrib, tried something approachable. Feedback obviously welcome.
drivers/staging/sm750fb/sm750.c | 32 +++++++++++++++--------------- drivers/staging/sm750fb/sm750.h | 14 ++++++------- drivers/staging/sm750fb/sm750_hw.c | 24 +++++++++++----------- 3 files changed, 35 insertions(+), 35 deletions(-)
drivers/staging/sm750fb/sm750.c +16 -16
@@ -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 :
@@ -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)
@@ -921,9 +921,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.setAllEngOff =0 ; - sm750_dev->init_parm.resetMemory =1 ; + 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 ;
@@ -942,9 +942,9 @@ static void sm750fb_setup(struct sm750_dev *sm750_dev, char *src) }else if (!strncmp (opt,"nocrt" ,strlen ("nocrt" ))) { sm750_dev->nocrt =1 ; }else if (!strncmp (opt,"36bit" ,strlen ("36bit" ))) { - sm750_dev->pnltype = sm750_doubleTFT; + sm750_dev->pnltype = sm750_double_tft; }else if (!strncmp (opt,"18bit" ,strlen ("18bit" ))) { - sm750_dev->pnltype = sm750_dualTFT; + sm750_dev->pnltype = sm750_dual_tft; }else if (!strncmp (opt,"24bit" ,strlen ("24bit" ))) { sm750_dev->pnltype = sm750_24TFT; }else if (!strncmp (opt,"nohwc0" ,strlen ("nohwc0" ))) {
@@ -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);pci_release_region (pdev,1 );kfree (g_settings); }
drivers/staging/sm750fb/sm750.h +7 -7
@@ -14,8 +14,8 @@enum sm750_pnltype { sm750_24TFT =0 ,/* 24bit tft */ - sm750_dualTFT =2 ,/* dual 18 bit tft */ - sm750_doubleTFT =1 ,/* 36 bit double pixel tft */ + sm750_dual_tft =2 ,/* dual 18 bit tft */ + sm750_double_tft =1 ,/* 36 bit double pixel tft */ };/* vga channel is not concerned */
@@ -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,8 +97,8 @@ 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;
drivers/staging/sm750fb/sm750_hw.c +12 -12
@@ -44,19 +44,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 err_release_region; } -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 );
@@ -71,19 +71,19 @@ 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) { +if (!sm750_dev->pv_mem) {pr_err ("Map video memory failed\n" ); ret = -EFAULT ; goto err_unmap_reg; } -pr_info ("video memory vaddr = %p\n" , sm750_dev->pvMem); +pr_info ("video memory vaddr = %p\n" , sm750_dev->pv_mem);return 0 ; err_unmap_reg: -iounmap (sm750_dev->pvReg); +iounmap (sm750_dev->pv_reg); err_release_region:pci_release_region (pdev,1 );return ret;
@@ -136,10 +136,10 @@ int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev)switch (sm750_dev->pnltype) {case sm750_24TFT:break ; -case sm750_doubleTFT: +case sm750_double_tft: val |=PANEL_DISPLAY_CTRL_DOUBLE_PIXEL ;break ; -case sm750_dualTFT: +case sm750_dual_tft: val |=PANEL_DISPLAY_CTRL_DUAL_DISPLAY ;break ; }
Signature · 1 line
2.34.1
Greg KH
maintainerQuoted 2 lines · Robert DeRienzo
- pvMem ->
p_mem
- pvReg ->p_reg
Why are you keeping the "p_"?
thanks,
greg k-h