diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-01 16:03:45 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2011-10-08 09:03:07 -0400 |
commit | 97b09da4ee36ec4bd0f6e16b84b4bb6fa05db110 (patch) | |
tree | 34c80d050a0cc8538d0fc22213772560dc3db2f3 /arch/arm/plat-pxa/mfp.c | |
parent | 7272889d3f40ed6aa2ade32bed5834789b3299cc (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 'arch/arm/plat-pxa/mfp.c')
-rw-r--r-- | arch/arm/plat-pxa/mfp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-pxa/mfp.c b/arch/arm/plat-pxa/mfp.c index be12eadcce20..2c4dbb1f4236 100644 --- a/arch/arm/plat-pxa/mfp.c +++ b/arch/arm/plat-pxa/mfp.c | |||
@@ -229,7 +229,7 @@ void mfp_write(int mfp, unsigned long val) | |||
229 | spin_unlock_irqrestore(&mfp_spin_lock, flags); | 229 | spin_unlock_irqrestore(&mfp_spin_lock, flags); |
230 | } | 230 | } |
231 | 231 | ||
232 | void __init mfp_init_base(unsigned long mfpr_base) | 232 | void __init mfp_init_base(void __iomem *mfpr_base) |
233 | { | 233 | { |
234 | int i; | 234 | int i; |
235 | 235 | ||
@@ -237,7 +237,7 @@ void __init mfp_init_base(unsigned long mfpr_base) | |||
237 | for (i = 0; i < ARRAY_SIZE(mfp_table); i++) | 237 | for (i = 0; i < ARRAY_SIZE(mfp_table); i++) |
238 | mfp_table[i].config = -1; | 238 | mfp_table[i].config = -1; |
239 | 239 | ||
240 | mfpr_mmio_base = (void __iomem *)mfpr_base; | 240 | mfpr_mmio_base = mfpr_base; |
241 | } | 241 | } |
242 | 242 | ||
243 | void __init mfp_init_addr(struct mfp_addr_map *map) | 243 | void __init mfp_init_addr(struct mfp_addr_map *map) |