diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-09-14 07:53:54 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-09-14 07:53:54 +0000 |
| commit | 468a903c0e5147e3f93187f0b808a3ef957fd00e (patch) | |
| tree | 63542d05b1c0f730ec1ad5f915dc4eb3c015e616 /drivers/irqchip/irq-vt8500.c | |
| parent | ce92bfe88ba38e76371feb93307125fac3f800f0 (diff) | |
| parent | 087fe000f086c933f831044cbd0e69b4e140f38c (diff) | |
Merge branch 'irqchip/handle_domain' into irqchip/core
Diffstat (limited to 'drivers/irqchip/irq-vt8500.c')
| -rw-r--r-- | drivers/irqchip/irq-vt8500.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/irqchip/irq-vt8500.c b/drivers/irqchip/irq-vt8500.c index eb6e91efdec8..b7af816f2769 100644 --- a/drivers/irqchip/irq-vt8500.c +++ b/drivers/irqchip/irq-vt8500.c @@ -181,7 +181,7 @@ static struct irq_domain_ops vt8500_irq_domain_ops = { static void __exception_irq_entry vt8500_handle_irq(struct pt_regs *regs) { u32 stat, i; - int irqnr, virq; + int irqnr; void __iomem *base; /* Loop through each active controller */ @@ -198,8 +198,7 @@ static void __exception_irq_entry vt8500_handle_irq(struct pt_regs *regs) continue; } - virq = irq_find_mapping(intc[i].domain, irqnr); - handle_IRQ(virq, regs); + handle_domain_irq(intc[i].domain, irqnr, regs); } } |