aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/irq.c
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 /arch/arm/mach-pxa/irq.c
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 'arch/arm/mach-pxa/irq.c')
-rw-r--r--arch/arm/mach-pxa/irq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index b09e848eb6c6..fead5c779a23 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -25,7 +25,7 @@
25 25
26#include "generic.h" 26#include "generic.h"
27 27
28#define IRQ_BASE (void __iomem *)io_p2v(0x40d00000) 28#define IRQ_BASE io_p2v(0x40d00000)
29 29
30#define ICIP (0x000) 30#define ICIP (0x000)
31#define ICMR (0x004) 31#define ICMR (0x004)
@@ -63,7 +63,7 @@ static inline void __iomem *irq_base(int i)
63 0x40d00130, 63 0x40d00130,
64 }; 64 };
65 65
66 return (void __iomem *)io_p2v(phys_base[i]); 66 return io_p2v(phys_base[i]);
67} 67}
68 68
69void pxa_mask_irq(struct irq_data *d) 69void pxa_mask_irq(struct irq_data *d)