aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/mbx
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-01 16:03:45 -0400
committerEric Miao <eric.y.miao@gmail.com>2011-10-08 09:03:07 -0400
commit97b09da4ee36ec4bd0f6e16b84b4bb6fa05db110 (patch)
tree34c80d050a0cc8538d0fc22213772560dc3db2f3 /drivers/video/mbx
parent7272889d3f40ed6aa2ade32bed5834789b3299cc (diff)
ARM: pxa: use correct __iomem annotations
This tries to clear up the confusion between integers and iomem pointers in the marvell pxa platform. MMIO addresses are supposed to be __iomem* values, in order to let the Linux type checking work correctly. This patch moves the cast to __iomem as far back as possible, to the place where the MMIO virtual address windows are defined. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'drivers/video/mbx')
-rw-r--r--drivers/video/mbx/mbxfb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
index afea9abbd678..6ce34160da78 100644
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
@@ -34,7 +34,7 @@
34#include "regs.h" 34#include "regs.h"
35#include "reg_bits.h" 35#include "reg_bits.h"
36 36
37static unsigned long virt_base_2700; 37static void __iomem *virt_base_2700;
38 38
39#define write_reg(val, reg) do { writel((val), (reg)); } while(0) 39#define write_reg(val, reg) do { writel((val), (reg)); } while(0)
40 40
@@ -850,7 +850,7 @@ static int mbxfb_suspend(struct platform_device *dev, pm_message_t state)
850{ 850{
851 /* make frame buffer memory enter self-refresh mode */ 851 /* make frame buffer memory enter self-refresh mode */
852 write_reg_dly(LMPWR_MC_PWR_SRM, LMPWR); 852 write_reg_dly(LMPWR_MC_PWR_SRM, LMPWR);
853 while (LMPWRSTAT != LMPWRSTAT_MC_PWR_SRM) 853 while (readl(LMPWRSTAT) != LMPWRSTAT_MC_PWR_SRM)
854 ; /* empty statement */ 854 ; /* empty statement */
855 855
856 /* reset the device, since it's initial state is 'mostly sleeping' */ 856 /* reset the device, since it's initial state is 'mostly sleeping' */
@@ -946,7 +946,7 @@ static int __devinit mbxfb_probe(struct platform_device *dev)
946 ret = -EINVAL; 946 ret = -EINVAL;
947 goto err3; 947 goto err3;
948 } 948 }
949 virt_base_2700 = (unsigned long)mfbi->reg_virt_addr; 949 virt_base_2700 = mfbi->reg_virt_addr;
950 950
951 mfbi->fb_virt_addr = ioremap_nocache(mfbi->fb_phys_addr, 951 mfbi->fb_virt_addr = ioremap_nocache(mfbi->fb_phys_addr,
952 res_size(mfbi->fb_req)); 952 res_size(mfbi->fb_req));