Commit d6a7c5c8 authored by Felipe Balbi's avatar Felipe Balbi Committed by Tony Lindgren

arm: omap: irq: get rid of ifdef hack

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: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 52b1e129
...@@ -234,24 +234,16 @@ static void __init omap_init_irq(u32 base, struct device_node *node) ...@@ -234,24 +234,16 @@ static void __init omap_init_irq(u32 base, struct device_node *node)
static asmlinkage void __exception_irq_entry static asmlinkage void __exception_irq_entry
omap_intc_handle_irq(struct pt_regs *regs) omap_intc_handle_irq(struct pt_regs *regs)
{ {
u32 irqnr; u32 irqnr = 0;
int handled_irq = 0; int handled_irq = 0;
int i;
do { do {
irqnr = intc_readl(INTC_PENDING_IRQ0); for (i = 0; i < omap_nr_pending; i++) {
if (irqnr) irqnr = intc_readl(INTC_PENDING_IRQ0 + (0x20 * i));
goto out; 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
out: out:
if (!irqnr) if (!irqnr)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment