diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-01 22:03:45 +0200 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2011-10-08 15:03:07 +0200 |
commit | 97b09da4ee36ec4bd0f6e16b84b4bb6fa05db110 (patch) | |
tree | 34c80d050a0cc8538d0fc22213772560dc3db2f3 /arch/arm/mach-mmp/mmp2.c | |
parent | ARM: pxa: sharpsl pm needs SPI (diff) | |
download | linux-97b09da4ee36ec4bd0f6e16b84b4bb6fa05db110.tar.xz linux-97b09da4ee36ec4bd0f6e16b84b4bb6fa05db110.zip |
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 'arch/arm/mach-mmp/mmp2.c')
-rw-r--r-- | arch/arm/mach-mmp/mmp2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c index 079c18861d5c..a80cbea40496 100644 --- a/arch/arm/mach-mmp/mmp2.c +++ b/arch/arm/mach-mmp/mmp2.c @@ -87,7 +87,8 @@ static struct mfp_addr_map mmp2_addr_map[] __initdata = { void mmp2_clear_pmic_int(void) { - unsigned long mfpr_pmic, data; + void __iomem *mfpr_pmic; + unsigned long data; mfpr_pmic = APB_VIRT_BASE + 0x1e000 + 0x2c4; data = __raw_readl(mfpr_pmic); |