aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2014-08-26 06:03:33 -0400
committerJason Cooper <jason@lakedaemon.net>2014-09-03 09:10:49 -0400
commitebc6de0056e277a0283845536fd219a96806fc80 (patch)
treec7501324d38c7a3f3dfc3de19f67382bbfeb4079
parentd8c0ffa56798a9b6dc6ee44d230a50f1fe0a10d4 (diff)
irqchip: gic-v3: Convert to handle_domain_irq
Use the new handle_domain_irq method to handle interrupts. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Link: https://lkml.kernel.org/r/1409047421-27649-19-git-send-email-marc.zyngier@arm.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--drivers/irqchip/irq-gic-v3.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 57eaa5a0b1e3..9e3144975696 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -274,14 +274,13 @@ static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs
274 irqnr = gic_read_iar(); 274 irqnr = gic_read_iar();
275 275
276 if (likely(irqnr > 15 && irqnr < 1020)) { 276 if (likely(irqnr > 15 && irqnr < 1020)) {
277 u64 irq = irq_find_mapping(gic_data.domain, irqnr); 277 int err;
278 if (likely(irq)) { 278 err = handle_domain_irq(gic_data.domain, irqnr, regs);
279 handle_IRQ(irq, regs); 279 if (err) {
280 continue; 280 WARN_ONCE(true, "Unexpected SPI received!\n");
281 gic_write_eoir(irqnr);
281 } 282 }
282 283 continue;
283 WARN_ONCE(true, "Unexpected SPI received!\n");
284 gic_write_eoir(irqnr);
285 } 284 }
286 if (irqnr < 16) { 285 if (irqnr < 16) {
287 gic_write_eoir(irqnr); 286 gic_write_eoir(irqnr);