[RFT/RFC/PATCH 31/31] arm: omap: irq: get rid of ifdef hack

Felipe Balbi
2013-11-20T18:10:57Z

we don't need the ifdef if we have omap_nr_pending
telling us how many pending registers we have
on current platform. This solves a possible
problem where we could try to handle bogus
interrupts on OMAP2 and OMAP3 if using single
zImage kernel, because we would end up reading
the following pending FIQ register.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/mach-omap2/irq.c | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 1b2266a..35669c1 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -234,23 +234,15 @@ static void __init omap_init_irq(u32 base, struct device_node *node)
static asmlinkage void __exception_irq_entry
omap_intc_handle_irq(struct pt_regs *regs)
{
- u32 irqnr;
+ u32 irqnr = 0;
+ int i;

do {
- irqnr = intc_readl(INTC_PENDING_IRQ0);
- if (irqnr)
- goto out;
-
- irqnr = intc_readl(INTC_PENDING_IRQ1);
- if (irqnr)
- goto out;
-
- irqnr = intc_readl(INTC_PENDING_IRQ2);
-#if IS_ENABLED(CONFIG_SOC_TI81XX) || IS_ENABLED(CONFIG_SOC_AM33XX)
- if (irqnr)
- goto out;
- irqnr = intc_readl(INTC_PENDING_IRQ3);
-#endif
+ for (i = 0; i < omap_nr_pending; i++) {
+ irqnr = intc_readl(INTC_PENDING_IRQ0 + (0x20 * i));
+ if (irqnr)
+ goto out;
+ }

out:
if (!irqnr)
--
1.8.4.GIT