staging: sm750fb: remove Hungarian notation and fix CamelCase
Subsystems (2)
v2 cover staging: sm750fb: remove Hungarian notation and fix CamelCase
This patch series refactors variable names in the sm750fb staging driver to align with the Linux kernel coding style and remove Hungarian notation.
The changes are split into two patches:
1. Rename 'pvReg' to 'mmio' to reflect its purpose as a memory-mapped I/O pointer.
2. Rename 'pvMem' to 'vram' to better describe the video RAM, and convert remaining CamelCase members in 'struct init_status' to snake_case.
Changes in v2:
- Replaced 'pvReg' with 'mmio' instead of 'pv_reg'.
- Replaced 'pvMem' with 'vram' instead of 'pv_mem'.
- Split naming changes into separate logical commits.
Jad Keskes (2):
staging: sm750fb: rename pvReg to mmio
staging: sm750fb: rename pvMem to vram and fix CamelCase
drivers/staging/sm750fb/sm750.c | 34 +++++++++++++++--------------- drivers/staging/sm750fb/sm750.h | 12 +++++------ drivers/staging/sm750fb/sm750_hw.c | 24 ++++++++++----------- 3 files changed, 35 insertions(+), 35 deletions(-)
Signature · 1 line
2.53.0
PATCH v2 1/2 staging: sm750fb: rename pvReg to mmio
Rename 'pvReg' to 'mmio', a more meaningful name that reflects its purpose as a memory-mapped I/O pointer. This improves readability and aligns with kernel naming conventions by removing Hungarian notation ('pv').
--- drivers/staging/sm750fb/sm750.c | 4 ++-- drivers/staging/sm750fb/sm750.h | 2 +- drivers/staging/sm750fb/sm750_hw.c | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/sm750fb/sm750.c +2 -2
@@ -764,7 +764,7 @@ 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->mmio +0x800f0 + (int )crtc->channel *0x140 ;pr_info ("crtc->cursor.mmio = %p\n" , crtc->cursor.mmio);
@@ -1121,7 +1121,7 @@ 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->mmio);iounmap (sm750_dev->pvMem);kfree (g_settings); }
drivers/staging/sm750fb/sm750.h +1 -1
@@ -97,7 +97,7 @@ struct sm750_dev {unsigned long vidreg_start;__u32 vidmem_size;__u32 vidreg_size; -void __iomem *pvReg; +void __iomem *mmio;unsigned char __iomem *pvMem;/* locks*/ spinlock_t slock;
drivers/staging/sm750fb/sm750_hw.c +7 -7
@@ -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->mmio =ioremap (sm750_dev->vidreg_start, sm750_dev->vidreg_size); -if (!sm750_dev->pvReg) { +if (!sm750_dev->mmio) {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->mmio); - 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->mmio +DE_BASE_ADDR_TYPE1 ; + sm750_dev->accel.dp_port_base = sm750_dev->mmio +DE_PORT_ADDR_TYPE1 ; - mmio750 = sm750_dev->pvReg; + mmio750 = sm750_dev->mmio;sm750_set_chip_type (sm750_dev->devid, sm750_dev->revid); sm750_dev->vidmem_start =pci_resource_start (pdev,0 );
@@ -79,7 +79,7 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) sm750_dev->pvMem =ioremap_wc (sm750_dev->vidmem_start, sm750_dev->vidmem_size);if (!sm750_dev->pvMem) { -iounmap (sm750_dev->pvReg); +iounmap (sm750_dev->mmio);pr_err ("Map video memory failed\n" ); ret = -EFAULT ; goto exit;
Signature · 1 line
2.53.0
PATCH v2 2/2 staging: sm750fb: rename pvMem to vram and fix CamelCase
In reply to Jad KeskesRename 'pvMem' to 'vram' to better describe the video RAM and remove Hungarian notation. Additionally, convert remaining CamelCase members in 'struct init_status' to snake_case to follow kernel coding standards.
--- drivers/staging/sm750fb/sm750.c | 30 +++++++++++++++--------------- drivers/staging/sm750fb/sm750.h | 10 +++++----- drivers/staging/sm750fb/sm750_hw.c | 10 +++++----- 3 files changed, 25 insertions(+), 25 deletions(-)
drivers/staging/sm750fb/sm750.c +15 -15
@@ -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->vram;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->vram;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->vram; }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->vram + 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->vram; }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->vram + crtc->o_screen; }break ;default :
@@ -771,7 +771,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->vram + crtc->cursor.offset;memset_io (crtc->cursor.vstart,0 , crtc->cursor.size);if (!g_hwcursor)
@@ -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->vram,0 , sm750_dev->vidmem_size);pci_set_drvdata (pdev, sm750_dev);
@@ -1122,7 +1122,7 @@ static void lynxfb_pci_remove(struct pci_dev *pdev)arch_phys_wc_del (sm750_dev->mtrr.vram);iounmap (sm750_dev->mmio); -iounmap (sm750_dev->pvMem); +iounmap (sm750_dev->vram);kfree (g_settings); }
drivers/staging/sm750fb/sm750.h +5 -5
@@ -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 {
@@ -98,11 +98,11 @@ struct sm750_dev {__u32 vidmem_size;__u32 vidreg_size;void __iomem *mmio; -unsigned char __iomem *pvMem; +unsigned char __iomem *vram;/* 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 +5 -5
@@ -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->vram =ioremap_wc (sm750_dev->vidmem_start, sm750_dev->vidmem_size); -if (!sm750_dev->pvMem) { +if (!sm750_dev->vram) {iounmap (sm750_dev->mmio);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->vram); 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