[ARM] Wrap calls to descriptor handlers

This is part of Thomas Gleixner's generic IRQ patch, which converts
ARM to use the generic IRQ subsystem.  Here, we wrap calls to
desc->handler() in an inline function, desc_handle_irq().  This
reduces the size of Thomas' patch since the changes become more
localised.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 6540db691338..dceb826bd216 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -585,7 +585,7 @@ ecard_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
 
                 if (pending) {
                         struct irqdesc *d = irq_desc + ec->irq;
-                        d->handle(ec->irq, d, regs);
+                        desc_handle_irq(ec->irq, d, regs);
                         called ++;
                 }
         }
@@ -632,7 +632,7 @@ ecard_irqexp_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg
                          * Serial cards should go in 0/1, ethernet/scsi in 2/3
                          * otherwise you will lose serial data at high speeds!
                          */
-                        d->handle(ec->irq, d, regs);
+                        desc_handle_irq(ec->irq, d, regs);
                 } else {
                         printk(KERN_WARNING "card%d: interrupt from unclaimed "
                                "card???\n", slot);
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 58b3bd000834..3284118f356b 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -517,7 +517,7 @@ static void do_pending_irqs(struct pt_regs *regs)
                 list_for_each_safe(l, n, &head) {
                         desc = list_entry(l, struct irqdesc, pend);
                         list_del_init(&desc->pend);
-                        desc->handle(desc - irq_desc, desc, regs);
+                        desc_handle_irq(desc - irq_desc, desc, regs);
                 }
 
                 /*
@@ -545,7 +545,7 @@ asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)
 
         irq_enter();
         spin_lock(&irq_controller_lock);
-        desc->handle(irq, desc, regs);
+        desc_handle_irq(irq, desc, regs);
 
         /*
          * Now re-run any pending interrupts.