diff options
| author | Javier M. Mellid <jmunhoz@igalia.com> | 2012-09-17 16:12:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 14:57:53 -0700 |
| commit | 87765b97718a301eeefcaca8867b48bea96b1727 (patch) | |
| tree | 43da5a267d50fedd04c8859a2e2bacc4c7bd16d7 | |
| parent | 3f28ed174198f210addf77b126573e29a0b75478 (diff) | |
| download | linux-3.10-87765b97718a301eeefcaca8867b48bea96b1727.tar.gz linux-3.10-87765b97718a301eeefcaca8867b48bea96b1727.tar.bz2 linux-3.10-87765b97718a301eeefcaca8867b48bea96b1727.zip | |
staging: sm7xxfb: remove smtc_VRAMBaseAddress
This patch erases smtc_VRAMBaseAddress variable.
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/sm7xxfb/sm7xxfb.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c index 11fb9f5c8ec..f27182d4dea 100644 --- a/drivers/staging/sm7xxfb/sm7xxfb.c +++ b/drivers/staging/sm7xxfb/sm7xxfb.c @@ -57,7 +57,6 @@ struct smtcfb_info { }; void __iomem *smtc_RegBaseAddress; /* Memory Map IO starting address */ -void __iomem *smtc_VRAMBaseAddress; /* video memory starting address */ static struct fb_var_screeninfo smtcfb_var = { .xres = 1024, @@ -737,7 +736,7 @@ static int smtc_map_smem(struct smtcfb_info *sfb, sfb->fb.fix.smem_len = smem_len; - sfb->fb.screen_base = smtc_VRAMBaseAddress; + sfb->fb.screen_base = sfb->lfb; if (!sfb->fb.screen_base) { dev_err(&pdev->dev, @@ -825,23 +824,18 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, sfb->fb.fix.mmio_len = 0x00400000; smem_size = SM712_VIDEOMEMORYSIZE; #ifdef __BIG_ENDIAN - sfb->lfb = (smtc_VRAMBaseAddress = - ioremap(mmio_base, 0x00c00000)); + sfb->lfb = ioremap(mmio_base, 0x00c00000); #else - sfb->lfb = (smtc_VRAMBaseAddress = - ioremap(mmio_base, 0x00800000)); + sfb->lfb = ioremap(mmio_base, 0x00800000); #endif sfb->mmio = (smtc_RegBaseAddress = - smtc_VRAMBaseAddress + 0x00700000); - sfb->dp_regs = smtc_VRAMBaseAddress + 0x00408000; + sfb->lfb + 0x00700000); + sfb->dp_regs = sfb->lfb + 0x00408000; sfb->vp_regs = sfb->lfb + 0x0040c000; #ifdef __BIG_ENDIAN if (sfb->fb.var.bits_per_pixel == 32) { - smtc_VRAMBaseAddress += 0x800000; sfb->lfb += 0x800000; - dev_info(&pdev->dev, - "smtc_VRAMBaseAddress=%p sfb->lfb=%p", - smtc_VRAMBaseAddress, sfb->lfb); + dev_info(&pdev->dev, "sfb->lfb=%p", sfb->lfb); } #endif if (!smtc_RegBaseAddress) { @@ -869,8 +863,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, sfb->fb.fix.mmio_len = 0x00200000; smem_size = SM722_VIDEOMEMORYSIZE; sfb->dp_regs = ioremap(mmio_base, 0x00a00000); - sfb->lfb = (smtc_VRAMBaseAddress = - sfb->dp_regs + 0x00200000); + sfb->lfb = sfb->dp_regs + 0x00200000; sfb->mmio = (smtc_RegBaseAddress = sfb->dp_regs + 0x000c0000); sfb->vp_regs = sfb->dp_regs + 0x800; |