irqchip: clps711x: 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-8-git-send-email-marc.zyngier@arm.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/drivers/irqchip/irq-clps711x.c b/drivers/irqchip/irq-clps711x.c
index 33340dc..33127f1 100644 (file)
--- a/drivers/irqchip/irq-clps711x.c
+++ b/drivers/irqchip/irq-clps711x.c
@@ -76,24 +76,20 @@ static struct {
 
 static asmlinkage void __exception_irq_entry clps711x_irqh(struct pt_regs *regs)
 {
-       u32 irqnr, irqstat;
+       u32 irqstat;
 
        do {
                irqstat = readw_relaxed(clps711x_intc->intmr[0]) &
                          readw_relaxed(clps711x_intc->intsr[0]);
-               if (irqstat) {
-                       irqnr = irq_find_mapping(clps711x_intc->domain,
-                                                fls(irqstat) - 1);
-                       handle_IRQ(irqnr, regs);
-               }
+               if (irqstat)
+                       handle_domain_irq(clps711x_intc->domain,
+                                         fls(irqstat) - 1, regs);
 
                irqstat = readw_relaxed(clps711x_intc->intmr[1]) &
                          readw_relaxed(clps711x_intc->intsr[1]);
-               if (irqstat) {
-                       irqnr = irq_find_mapping(clps711x_intc->domain,
-                                                fls(irqstat) - 1 + 16);
-                       handle_IRQ(irqnr, regs);
-               }
+               if (irqstat)
+                       handle_domain_irq(clps711x_intc->domain,
+                                         fls(irqstat) - 1 + 16, regs);
        } while (irqstat);
 }