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>

Signed-off-by: Jennifer Guo <guojy.bj@gmail.com>
Link: https://patch.msgid.link/20260510062908.67848-2-guojy.bj@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index fadba95850be7a7d2265e63e9458ffa25ca376d0..d8cb9fce268df4f10e3ff1ef823d37e6e94bd1c4 100644 (file)
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -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);
 }

diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index 49a79d0a8a2e29599bd258fe993880d3a7a6eb43..2c9038d38b3c9ba9b86616007c1cd57052ebc7c9 100644 (file)
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -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;
 

diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c
index 780fe6c391d32b2f98855a8cacf00aae164c0c5b..6f7c354a34a1b300d7a4472390b04e4f6f40f926 100644 (file)
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -64,9 +64,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;