diff options
author | Felipe Balbi <balbi@ti.com> | 2014-09-08 20:54:37 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2014-09-11 16:03:38 -0400 |
commit | d1e66d69616db9325f397e004c54042622d48e83 (patch) | |
tree | b5378974973ad27183234366d85d6f236679738d /arch/arm/mach-omap2 | |
parent | 1198365625bf22294263267df3360cb2a4c76f2d (diff) |
arm: omap: irq: remove unnecessary base_addr argument
omap_intc_handle_irq now had an unnecessary
base_addr argument. Let's remove it and fix
all callers.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/irq.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index e1fc4f7c3eb5..718b776db61e 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
@@ -46,8 +46,6 @@ | |||
46 | #define INTC_PENDING_IRQ3 0x00f8 | 46 | #define INTC_PENDING_IRQ3 0x00f8 |
47 | #define INTC_ILR0 0x0100 | 47 | #define INTC_ILR0 0x0100 |
48 | 48 | ||
49 | #define OMAP2_IRQ_BASE OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE) | ||
50 | #define OMAP3_IRQ_BASE OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE) | ||
51 | #define ACTIVEIRQ_MASK 0x7f /* omap2/3 active interrupt bits */ | 49 | #define ACTIVEIRQ_MASK 0x7f /* omap2/3 active interrupt bits */ |
52 | #define INTCPS_NR_ILR_REGS 128 | 50 | #define INTCPS_NR_ILR_REGS 128 |
53 | #define INTCPS_NR_MIR_REGS 3 | 51 | #define INTCPS_NR_MIR_REGS 3 |
@@ -188,7 +186,7 @@ void __init ti81xx_init_irq(void) | |||
188 | omap_init_irq(OMAP34XX_IC_BASE, 128, NULL); | 186 | omap_init_irq(OMAP34XX_IC_BASE, 128, NULL); |
189 | } | 187 | } |
190 | 188 | ||
191 | static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs *regs) | 189 | static inline void omap_intc_handle_irq(struct pt_regs *regs) |
192 | { | 190 | { |
193 | u32 irqnr; | 191 | u32 irqnr; |
194 | int handled_irq = 0; | 192 | int handled_irq = 0; |
@@ -232,8 +230,7 @@ out: | |||
232 | 230 | ||
233 | asmlinkage void __exception_irq_entry omap2_intc_handle_irq(struct pt_regs *regs) | 231 | asmlinkage void __exception_irq_entry omap2_intc_handle_irq(struct pt_regs *regs) |
234 | { | 232 | { |
235 | void __iomem *base_addr = OMAP2_IRQ_BASE; | 233 | omap_intc_handle_irq(regs); |
236 | omap_intc_handle_irq(base_addr, regs); | ||
237 | } | 234 | } |
238 | 235 | ||
239 | int __init intc_of_init(struct device_node *node, | 236 | int __init intc_of_init(struct device_node *node, |
@@ -334,7 +331,6 @@ void omap3_intc_resume_idle(void) | |||
334 | 331 | ||
335 | asmlinkage void __exception_irq_entry omap3_intc_handle_irq(struct pt_regs *regs) | 332 | asmlinkage void __exception_irq_entry omap3_intc_handle_irq(struct pt_regs *regs) |
336 | { | 333 | { |
337 | void __iomem *base_addr = OMAP3_IRQ_BASE; | 334 | omap_intc_handle_irq(regs); |
338 | omap_intc_handle_irq(base_addr, regs); | ||
339 | } | 335 | } |
340 | #endif /* CONFIG_ARCH_OMAP3 */ | 336 | #endif /* CONFIG_ARCH_OMAP3 */ |