irqchip: mmp: Convert to handle_domain_irq
authorMarc Zyngier <marc.zyngier@arm.com>
Tue, 26 Aug 2014 10:03:23 +0000 (11:03 +0100)
committerJason Cooper <jason@lakedaemon.net>
Wed, 3 Sep 2014 13:10:34 +0000 (13:10 +0000)
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-9-git-send-email-marc.zyngier@arm.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
drivers/irqchip/irq-mmp.c

index 1c3e2c9b46bae59c96e9f2851d988af4d13b33c6..c0da57bdb89dfcf0c0e2224180715989a88086a6 100644 (file)
@@ -196,26 +196,24 @@ static struct mmp_intc_conf mmp2_conf = {
 
 static void __exception_irq_entry mmp_handle_irq(struct pt_regs *regs)
 {
-       int irq, hwirq;
+       int hwirq;
 
        hwirq = readl_relaxed(mmp_icu_base + PJ1_INT_SEL);
        if (!(hwirq & SEL_INT_PENDING))
                return;
        hwirq &= SEL_INT_NUM_MASK;
-       irq = irq_find_mapping(icu_data[0].domain, hwirq);
-       handle_IRQ(irq, regs);
+       handle_domain_irq(icu_data[0].domain, hwirq, regs);
 }
 
 static void __exception_irq_entry mmp2_handle_irq(struct pt_regs *regs)
 {
-       int irq, hwirq;
+       int hwirq;
 
        hwirq = readl_relaxed(mmp_icu_base + PJ4_INT_SEL);
        if (!(hwirq & SEL_INT_PENDING))
                return;
        hwirq &= SEL_INT_NUM_MASK;
-       irq = irq_find_mapping(icu_data[0].domain, hwirq);
-       handle_IRQ(irq, regs);
+       handle_domain_irq(icu_data[0].domain, hwirq, regs);
 }
 
 /* MMP (ARMv5) */