[PATCH v3] staging: sm750fb: rename variables to comply with kernel style
André Moreira <[email protected]> Tue, 7 Jul 2026 08:43:27 -0300
| Newsgroups | org.kernel.vger.linux-fbdev,dev.linux.lists.linux-staging,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
Rename 'pvReg' to 'regs' to remove Hungarian notation, and rename 'setAllEngOff' to 'set_all_eng_off' to avoid CamelCase throughout the driver. Signed-off-by: André Moreira <[email protected]> --- Changes in v3: - Added changelog history to satisfy the bot. Changes in v2: - Renamed 'pv_reg' to 'regs' to completely remove Hungarian notation, based on Greg KH's feedback. drivers/staging/sm750fb/sm750.c | 6 +++--- drivers/staging/sm750fb/sm750.h | 4 ++-- drivers/staging/sm750fb/sm750_hw.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index 89c811e0806c4..7cd9cb0b3498c 100644 --- a/drivers/staging/sm750fb/sm750.c +++ b/drivers/staging/sm750fb/sm750.c @@ -743,7 +743,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->regs + 0x800f0 + (int)crtc->channel * 0x140; crtc->cursor.max_h = 64; @@ -848,7 +848,7 @@ static void sm750fb_setup(struct sm750_dev *sm750_dev, char *src) 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.setAllEngOff = 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 */ @@ -1047,7 +1047,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->regs); iounmap(sm750_dev->vmem); pci_release_region(pdev, 1); kfree(g_settings); diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h index d2c522e67f26a..32f9a9ac7be73 100644 --- a/drivers/staging/sm750fb/sm750.h +++ b/drivers/staging/sm750fb/sm750.h @@ -44,7 +44,7 @@ struct init_status { ushort chip_clk; ushort mem_clk; ushort master_clk; - ushort setAllEngOff; + ushort set_all_eng_off; ushort reset_memory; }; @@ -97,7 +97,7 @@ struct sm750_dev { unsigned long vidreg_start; __u32 vidmem_size; __u32 vidreg_size; - void __iomem *pvReg; + void __iomem *regs; unsigned char __iomem *vmem; /* locks*/ spinlock_t slock; diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c index 34a837fb4b649..c5a495bb5ac57 100644 --- a/drivers/staging/sm750fb/sm750_hw.c +++ b/drivers/staging/sm750fb/sm750_hw.c @@ -23,18 +23,18 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) } /* now map mmio and vidmem */ - sm750_dev->pvReg = + sm750_dev->regs = ioremap(sm750_dev->vidreg_start, sm750_dev->vidreg_size); - if (!sm750_dev->pvReg) { + if (!sm750_dev->regs) { dev_err(&pdev->dev, "mmio failed\n"); ret = -EFAULT; goto err_release_region; } - 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->regs + DE_BASE_ADDR_TYPE1; + sm750_dev->accel.dp_port_base = sm750_dev->regs + DE_PORT_ADDR_TYPE1; - mmio750 = sm750_dev->pvReg; + mmio750 = sm750_dev->regs; sm750_set_chip_type(sm750_dev->devid, sm750_dev->revid); sm750_dev->vidmem_start = pci_resource_start(pdev, 0); @@ -58,7 +58,7 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev) return 0; err_unmap_reg: - iounmap(sm750_dev->pvReg); + iounmap(sm750_dev->regs); err_release_region: pci_release_region(pdev, 1); return ret; -- 2.43.0