staging: sm7xxfb: rename some smtcfb_info fields

This patch improves naming style and comments on smtcfb_info fields.

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index 3fa55a8186ed4fb40c8f597c019b27cf1e5ebdf3..1358fc78c4bf176204d41c2f0bef0ac5745d32c0 100644 (file)
--- a/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -43,11 +43,11 @@ struct smtcfb_info {
        u16 chip_id;
        u8  chip_rev_id;
 
-       void __iomem *m_pMMIO;
-       void __iomem *m_pLFB;
-       void __iomem *m_pDPR;
-       void __iomem *m_pVPR;
-       void __iomem *m_pCPR;
+       void __iomem *lfb;      /* linear frame buffer */
+       void __iomem *dp_regs;  /* drawing processor control regs */
+       void __iomem *vp_regs;  /* video processor control regs */
+       void __iomem *cp_regs;  /* capture processor control regs */
+       void __iomem *mmio;     /* memory map IO port */
 
        u_int width;
        u_int height;
@@ -551,28 +551,28 @@ static void sm7xx_set_timing(struct smtcfb_info *sfb)
        smtc_mmiowb(0x67, 0x3c2);
 
        /* set VPR registers */
-       writel(0x0, sfb->m_pVPR + 0x0C);
-       writel(0x0, sfb->m_pVPR + 0x40);
+       writel(0x0, sfb->vp_regs + 0x0C);
+       writel(0x0, sfb->vp_regs + 0x40);
 
        /* set data width */
        m_nScreenStride =
                (sfb->width * sfb->fb.var.bits_per_pixel) / 64;
        switch (sfb->fb.var.bits_per_pixel) {
        case 8:
-               writel(0x0, sfb->m_pVPR + 0x0);
+               writel(0x0, sfb->vp_regs + 0x0);
                break;
        case 16:
-               writel(0x00020000, sfb->m_pVPR + 0x0);
+               writel(0x00020000, sfb->vp_regs + 0x0);
                break;
        case 24:
-               writel(0x00040000, sfb->m_pVPR + 0x0);
+               writel(0x00040000, sfb->vp_regs + 0x0);
                break;
        case 32:
-               writel(0x00030000, sfb->m_pVPR + 0x0);
+               writel(0x00030000, sfb->vp_regs + 0x0);
                break;
        }
        writel((u32) (((m_nScreenStride + 2) << 16) | m_nScreenStride),
-              sfb->m_pVPR + 0x10);
+              sfb->vp_regs + 0x10);
 
 }
 
@@ -825,23 +825,23 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
                sfb->fb.fix.mmio_len = 0x00400000;
                smem_size = SM712_VIDEOMEMORYSIZE;
 #ifdef __BIG_ENDIAN
-               sfb->m_pLFB = (smtc_VRAMBaseAddress =
+               sfb->lfb = (smtc_VRAMBaseAddress =
                    ioremap(pFramebufferPhysical, 0x00c00000));
 #else
-               sfb->m_pLFB = (smtc_VRAMBaseAddress =
+               sfb->lfb = (smtc_VRAMBaseAddress =
                    ioremap(pFramebufferPhysical, 0x00800000));
 #endif
-               sfb->m_pMMIO = (smtc_RegBaseAddress =
+               sfb->mmio = (smtc_RegBaseAddress =
                    smtc_VRAMBaseAddress + 0x00700000);
-               sfb->m_pDPR = smtc_VRAMBaseAddress + 0x00408000;
-               sfb->m_pVPR = sfb->m_pLFB + 0x0040c000;
+               sfb->dp_regs = smtc_VRAMBaseAddress + 0x00408000;
+               sfb->vp_regs = sfb->lfb + 0x0040c000;
 #ifdef __BIG_ENDIAN
                if (sfb->fb.var.bits_per_pixel == 32) {
                        smtc_VRAMBaseAddress += 0x800000;
-                       sfb->m_pLFB += 0x800000;
+                       sfb->lfb += 0x800000;
                        dev_info(&pdev->dev,
-                                "smtc_VRAMBaseAddress=%p sfb->m_pLFB=%p",
-                                 smtc_VRAMBaseAddress, sfb->m_pLFB);
+                                "smtc_VRAMBaseAddress=%p sfb->lfb=%p",
+                                 smtc_VRAMBaseAddress, sfb->lfb);
                }
 #endif
                if (!smtc_RegBaseAddress) {
@@ -868,12 +868,12 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
                sfb->fb.fix.mmio_start = pFramebufferPhysical;
                sfb->fb.fix.mmio_len = 0x00200000;
                smem_size = SM722_VIDEOMEMORYSIZE;
-               sfb->m_pDPR = ioremap(pFramebufferPhysical, 0x00a00000);
-               sfb->m_pLFB = (smtc_VRAMBaseAddress =
-                   sfb->m_pDPR + 0x00200000);
-               sfb->m_pMMIO = (smtc_RegBaseAddress =
-                   sfb->m_pDPR + 0x000c0000);
-               sfb->m_pVPR = sfb->m_pDPR + 0x800;
+               sfb->dp_regs = ioremap(pFramebufferPhysical, 0x00a00000);
+               sfb->lfb = (smtc_VRAMBaseAddress =
+                   sfb->dp_regs + 0x00200000);
+               sfb->mmio = (smtc_RegBaseAddress =
+                   sfb->dp_regs + 0x000c0000);
+               sfb->vp_regs = sfb->dp_regs + 0x800;
 
                smtc_seqw(0x62, 0xff);
                smtc_seqw(0x6a, 0x0d);