[ARM] 3686/1: ARM: arm/common: convert irq handling

Patch from Thomas Gleixner

From: Thomas Gleixner <tglx@linutronix.de>

Convert the files in arch/arm/common to use the generic
irq handling functions.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index fe06a36a2130..1cdb26a47e1f 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -150,7 +150,7 @@ static void
 sa1111_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
 {
         unsigned int stat0, stat1, i;
-        void __iomem *base = desc->data;
+        void __iomem *base = get_irq_data(irq);
 
         stat0 = sa1111_readl(base + SA1111_INTSTATCLR0);
         stat1 = sa1111_readl(base + SA1111_INTSTATCLR1);
@@ -168,11 +168,11 @@ sa1111_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
 
         for (i = IRQ_SA1111_START; stat0; i++, stat0 >>= 1)
                 if (stat0 & 1)
-                        do_edge_IRQ(i, irq_desc + i, regs);
+                        handle_edge_irq(i, irq_desc + i, regs);
 
         for (i = IRQ_SA1111_START + 32; stat1; i++, stat1 >>= 1)
                 if (stat1 & 1)
-                        do_edge_IRQ(i, irq_desc + i, regs);
+                        handle_edge_irq(i, irq_desc + i, regs);
 
         /* For level-based interrupts */
         desc->chip->unmask(irq);