diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-09-14 09:53:54 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-09-14 09:53:54 +0200 |
| commit | 468a903c0e5147e3f93187f0b808a3ef957fd00e (patch) | |
| tree | 63542d05b1c0f730ec1ad5f915dc4eb3c015e616 /drivers/irqchip/irq-atmel-aic5.c | |
| parent | Merge branch 'irqchip/gic' into irqchip/core (diff) | |
| parent | openrisc: Get rid of handle_IRQ (diff) | |
| download | linux-468a903c0e5147e3f93187f0b808a3ef957fd00e.tar.xz linux-468a903c0e5147e3f93187f0b808a3ef957fd00e.zip | |
Merge branch 'irqchip/handle_domain' into irqchip/core
Diffstat (limited to 'drivers/irqchip/irq-atmel-aic5.c')
| -rw-r--r-- | drivers/irqchip/irq-atmel-aic5.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/irqchip/irq-atmel-aic5.c b/drivers/irqchip/irq-atmel-aic5.c index edb227081524..04fe2c1b5178 100644 --- a/drivers/irqchip/irq-atmel-aic5.c +++ b/drivers/irqchip/irq-atmel-aic5.c @@ -78,12 +78,10 @@ aic5_handle(struct pt_regs *regs) irqnr = irq_reg_readl(gc->reg_base + AT91_AIC5_IVR); irqstat = irq_reg_readl(gc->reg_base + AT91_AIC5_ISR); - irqnr = irq_find_mapping(aic5_domain, irqnr); - if (!irqstat) irq_reg_writel(0, gc->reg_base + AT91_AIC5_EOICR); else - handle_IRQ(irqnr, regs); + handle_domain_irq(aic5_domain, irqnr, regs); } static void aic5_mask(struct irq_data *d) |