23 files changed, 41 insertions, 41 deletions

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index 30ab1c3e1d4d..51f430cc2fbf 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -177,7 +177,7 @@ static void locomo_handler(unsigned int irq, struct irqdesc *desc,
                 d = irq_desc + irq;
                 for (i = 0; i <= 3; i++, d++, irq++) {
                         if (req & (0x0100 << i)) {
-                                d->handle(irq, d, regs);
+                                desc_handle_irq(irq, d, regs);
                         }
 
                 }
@@ -220,7 +220,7 @@ static void locomo_key_handler(unsigned int irq, struct irqdesc *desc,
 
         if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) & 0x0001) {
                 d = irq_desc + LOCOMO_IRQ_KEY_START;
-                d->handle(LOCOMO_IRQ_KEY_START, d, regs);
+                desc_handle_irq(LOCOMO_IRQ_KEY_START, d, regs);
         }
 }
 
@@ -273,7 +273,7 @@ static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc,
                 d = irq_desc + LOCOMO_IRQ_GPIO_START;
                 for (i = 0; i <= 15; i++, irq++, d++) {
                         if (req & (0x0001 << i)) {
-                                d->handle(irq, d, regs);
+                                desc_handle_irq(irq, d, regs);
                         }
                 }
         }
@@ -328,7 +328,7 @@ static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc,
 
         if (locomo_readl(mapbase + LOCOMO_LTINT) & 0x0001) {
                 d = irq_desc + LOCOMO_IRQ_LT_START;
-                d->handle(LOCOMO_IRQ_LT_START, d, regs);
+                desc_handle_irq(LOCOMO_IRQ_LT_START, d, regs);
         }
 }
 
@@ -379,7 +379,7 @@ static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc,
 
                 for (i = 0; i <= 3; i++, irq++, d++) {
                         if (req & (0x0001 << i)) {
-                                d->handle(irq, d, regs);
+                                desc_handle_irq(irq, d, regs);
                         }
                 }
         }
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.
diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c
index b21016070ea3..e1c43b331d64 100644
--- a/arch/arm/mach-footbridge/isa-irq.c
+++ b/arch/arm/mach-footbridge/isa-irq.c
@@ -95,7 +95,7 @@ isa_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
         }
 
         desc = irq_desc + isa_irq;
-        desc->handle(isa_irq, desc, regs);
+        desc_handle_irq(isa_irq, desc, regs);
 }
 
 static struct irqaction irq_cascade = { .handler = no_action, .name = "cascade", };
diff --git a/arch/arm/mach-h720x/common.c b/arch/arm/mach-h720x/common.c
index 96aa3af70d86..5110e2e65ddd 100644
--- a/arch/arm/mach-h720x/common.c
+++ b/arch/arm/mach-h720x/common.c
@@ -108,7 +108,7 @@ h720x_gpio_handler(unsigned int mask, unsigned int irq,
         while (mask) {
                 if (mask & 1) {
                         IRQDBG("handling irq %d\n", irq);
-                        desc->handle(irq, desc, regs);
+                        desc_handle_irq(irq, desc, regs);
                 }
                 irq++;
                 desc++;
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c
index 593b6a2a30e1..4b3199319e68 100644
--- a/arch/arm/mach-h720x/cpu-h7202.c
+++ b/arch/arm/mach-h720x/cpu-h7202.c
@@ -126,7 +126,7 @@ h7202_timerx_demux_handler(unsigned int irq_unused, struct irqdesc *desc,
         desc = irq_desc + irq;
         while (mask) {
                 if (mask & 1)
-                        desc->handle(irq, desc, regs);
+                        desc_handle_irq(irq, desc, regs);
                 irq++;
                 desc++;
                 mask >>= 1;
diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c
index 45d22dd5583a..eeb8a6d4a399 100644
--- a/arch/arm/mach-imx/irq.c
+++ b/arch/arm/mach-imx/irq.c
@@ -152,7 +152,7 @@ imx_gpio_handler(unsigned int mask, unsigned int irq,
         while (mask) {
                 if (mask & 1) {
                         DEBUG_IRQ("handling irq %d\n", irq);
-                        desc->handle(irq, desc, regs);
+                        desc_handle_irq(irq, desc, regs);
                 }
                 irq++;
                 desc++;
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 569f328c479d..2be5c03ab87f 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -170,7 +170,7 @@ sic_handle_irq(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
                 irq += IRQ_SIC_START;
 
                 desc = irq_desc + irq;
-                desc->handle(irq, desc, regs);
+                desc_handle_irq(irq, desc, regs);
         } while (status);
 }
 
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index 594b4c4d5b11..781d10ae00b7 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -317,7 +317,7 @@ static void ixp2000_GPIO_irq_handler(unsigned int irq, struct irqdesc *desc, str
         for (i = 0; i <= 7; i++) {
                 if (status & (1<<i)) {
                         desc = irq_desc + i + IRQ_IXP2000_GPIO0;
-                        desc->handle(i + IRQ_IXP2000_GPIO0, desc, regs);
+                        desc_handle_irq(i + IRQ_IXP2000_GPIO0, desc, regs);
                 }
         }
 }
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c
index a43369ad876c..63ba0191aa65 100644
--- a/arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/arch/arm/mach-ixp2000/ixdp2x00.c
@@ -133,7 +133,7 @@ static void ixdp2x00_irq_handler(unsigned int irq, struct irqdesc *desc, struct
                         struct irqdesc *cpld_desc;
                         int cpld_irq = IXP2000_BOARD_IRQ(0) + i;
                         cpld_desc = irq_desc + cpld_irq;
-                        cpld_desc->handle(cpld_irq, cpld_desc, regs);
+                        desc_handle_irq(cpld_irq, cpld_desc, regs);
                 }
         }
 
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index 43447dad1657..7a5109921287 100644
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -82,7 +82,7 @@ static void ixdp2x01_irq_handler(unsigned int irq, struct irqdesc *desc, struct
                         struct irqdesc *cpld_desc;
                         int cpld_irq = IXP2000_BOARD_IRQ(0) + i;
                         cpld_desc = irq_desc + cpld_irq;
-                        cpld_desc->handle(cpld_irq, cpld_desc, regs);
+                        desc_handle_irq(cpld_irq, cpld_desc, regs);
                 }
         }
 
diff --git a/arch/arm/mach-lh7a40x/common.h b/arch/arm/mach-lh7a40x/common.h
index beda7c2602fb..578a52461fdb 100644
--- a/arch/arm/mach-lh7a40x/common.h
+++ b/arch/arm/mach-lh7a40x/common.h
@@ -13,4 +13,4 @@ extern struct sys_timer lh7a40x_timer;
 extern void lh7a400_init_irq (void);
 extern void lh7a404_init_irq (void);
 
-#define IRQ_DISPATCH(irq) irq_desc[irq].handle ((irq), &irq_desc[irq], regs)
+#define IRQ_DISPATCH(irq) desc_handle_irq((irq),(irq_desc + irq), regs)
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c
index 7c08f6c2e1d0..c12a78335625 100644
--- a/arch/arm/mach-omap1/fpga.c
+++ b/arch/arm/mach-omap1/fpga.c
@@ -102,7 +102,7 @@ void innovator_fpga_IRQ_demux(unsigned int irq, struct irqdesc *desc,
              fpga_irq++, stat >>= 1) {
                 if (stat & 1) {
                         d = irq_desc + fpga_irq;
-                        d->handle(fpga_irq, d, regs);
+                        desc_handle_irq(fpga_irq, d, regs);
                 }
         }
 }
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 6cf35f674464..539b596005fc 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -157,7 +157,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc,
                         mask >>= 2;
                         do {
                                 if (mask & 1)
-                                        desc->handle(irq, desc, regs);
+                                        desc_handle_irq(irq, desc, regs);
                                 irq++;
                                 desc++;
                                 mask >>= 1;
@@ -172,7 +172,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc,
                         desc = irq_desc + irq;
                         do {
                                 if (mask & 1)
-                                        desc->handle(irq, desc, regs);
+                                        desc_handle_irq(irq, desc, regs);
                                 irq++;
                                 desc++;
                                 mask >>= 1;
@@ -187,7 +187,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc,
                         desc = irq_desc + irq;
                         do {
                                 if (mask & 1)
-                                        desc->handle(irq, desc, regs);
+                                        desc_handle_irq(irq, desc, regs);
                                 irq++;
                                 desc++;
                                 mask >>= 1;
@@ -203,7 +203,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc,
                         desc = irq_desc + irq;
                         do {
                                 if (mask & 1)
-                                        desc->handle(irq, desc, regs);
+                                        desc_handle_irq(irq, desc, regs);
                                 irq++;
                                 desc++;
                                 mask >>= 1;
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 6309853b59be..923f6eb774c0 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -84,7 +84,7 @@ static void lubbock_irq_handler(unsigned int irq, struct irqdesc *desc,
                 if (likely(pending)) {
                         irq = LUBBOCK_IRQ(0) + __ffs(pending);
                         desc = irq_desc + irq;
-                        desc->handle(irq, desc, regs);
+                        desc_handle_irq(irq, desc, regs);
                 }
                 pending = LUB_IRQ_SET_CLR & lubbock_irq_enabled;
         } while (pending);
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 827b7b5a5be8..85fdb5b1470a 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -72,7 +72,7 @@ static void mainstone_irq_handler(unsigned int irq, struct irqdesc *desc,
                 if (likely(pending)) {
                         irq = MAINSTONE_IRQ(0) + __ffs(pending);
                         desc = irq_desc + irq;
-                        desc->handle(irq, desc, regs);
+                        desc_handle_irq(irq, desc, regs);
                 }
                 pending = MST_INTSETCLR & mainstone_irq_enabled;
         } while (pending);
diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c
index 5e5bbe893cbb..49914709fa09 100644
--- a/arch/arm/mach-s3c2410/bast-irq.c
+++ b/arch/arm/mach-s3c2410/bast-irq.c
@@ -124,7 +124,7 @@ bast_irq_pc104_demux(unsigned int irq,
                         irqno = bast_pc104_irqs[i];
                         desc = irq_desc + irqno;
 
-                        desc->handle(irqno, desc, regs);
+                        desc_handle_irq(irqno, desc, regs);
                 }
 
                 stat >>= 1;
diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
index 67138797866a..66d8c068e940 100644
--- a/arch/arm/mach-s3c2410/irq.c
+++ b/arch/arm/mach-s3c2410/irq.c
@@ -496,11 +496,11 @@ static void s3c_irq_demux_adc(unsigned int irq,
         if (subsrc != 0) {
                 if (subsrc & 1) {
                         mydesc = irq_desc + IRQ_TC;
-                        mydesc->handle( IRQ_TC, mydesc, regs);
+                        desc_handle_irq(IRQ_TC, mydesc, regs);
                 }
                 if (subsrc & 2) {
                         mydesc = irq_desc + IRQ_ADC;
-                        mydesc->handle(IRQ_ADC, mydesc, regs);
+                        desc_handle_irq(IRQ_ADC, mydesc, regs);
                 }
         }
 }
@@ -529,17 +529,17 @@ static void s3c_irq_demux_uart(unsigned int start,
                 desc = irq_desc + start;
 
                 if (subsrc & 1)
-                        desc->handle(start, desc, regs);
+                        desc_handle_irq(start, desc, regs);
 
                 desc++;
 
                 if (subsrc & 2)
-                        desc->handle(start+1, desc, regs);
+                        desc_handle_irq(start+1, desc, regs);
 
                 desc++;
 
                 if (subsrc & 4)
-                        desc->handle(start+2, desc, regs);
+                        desc_handle_irq(start+2, desc, regs);
         }
 }
 
diff --git a/arch/arm/mach-s3c2410/s3c2440-irq.c b/arch/arm/mach-s3c2410/s3c2440-irq.c
index 7cb9912242a3..278d0044c85d 100644
--- a/arch/arm/mach-s3c2410/s3c2440-irq.c
+++ b/arch/arm/mach-s3c2410/s3c2440-irq.c
@@ -64,11 +64,11 @@ static void s3c_irq_demux_wdtac97(unsigned int irq,
         if (subsrc != 0) {
                 if (subsrc & 1) {
                         mydesc = irq_desc + IRQ_S3C2440_WDT;
-                        mydesc->handle( IRQ_S3C2440_WDT, mydesc, regs);
+                        desc_handle_irq(IRQ_S3C2440_WDT, mydesc, regs);
                 }
                 if (subsrc & 2) {
                         mydesc = irq_desc + IRQ_S3C2440_AC97;
-                        mydesc->handle(IRQ_S3C2440_AC97, mydesc, regs);
+                        desc_handle_irq(IRQ_S3C2440_AC97, mydesc, regs);
                 }
         }
 }
@@ -122,11 +122,11 @@ static void s3c_irq_demux_cam(unsigned int irq,
         if (subsrc != 0) {
                 if (subsrc & 1) {
                         mydesc = irq_desc + IRQ_S3C2440_CAM_C;
-                        mydesc->handle( IRQ_S3C2440_WDT, mydesc, regs);
+                        desc_handle_irq(IRQ_S3C2440_CAM_C, mydesc, regs);
                 }
                 if (subsrc & 2) {
                         mydesc = irq_desc + IRQ_S3C2440_CAM_P;
-                        mydesc->handle(IRQ_S3C2440_AC97, mydesc, regs);
+                        desc_handle_irq(IRQ_S3C2440_CAM_P, mydesc, regs);
                 }
         }
 }
diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c
index cc349bc1b7c2..c131a5201b5b 100644
--- a/arch/arm/mach-sa1100/irq.c
+++ b/arch/arm/mach-sa1100/irq.c
@@ -126,7 +126,7 @@ sa1100_high_gpio_handler(unsigned int irq, struct irqdesc *desc,
                 mask >>= 11;
                 do {
                         if (mask & 1)
-                                desc->handle(irq, desc, regs);
+                                desc_handle_irq(irq, desc, regs);
                         mask >>= 1;
                         irq++;
                         desc++;
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
index 1405383463ea..fc061641b7be 100644
--- a/arch/arm/mach-sa1100/neponset.c
+++ b/arch/arm/mach-sa1100/neponset.c
@@ -61,12 +61,12 @@ neponset_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg
 
                         if (irr & IRR_ETHERNET) {
                                 d = irq_desc + IRQ_NEPONSET_SMC9196;
-                                d->handle(IRQ_NEPONSET_SMC9196, d, regs);
+                                desc_handle_irq(IRQ_NEPONSET_SMC9196, d, regs);
                         }
 
                         if (irr & IRR_USAR) {
                                 d = irq_desc + IRQ_NEPONSET_USAR;
-                                d->handle(IRQ_NEPONSET_USAR, d, regs);
+                                desc_handle_irq(IRQ_NEPONSET_USAR, d, regs);
                         }
 
                         desc->chip->unmask(irq);
@@ -74,7 +74,7 @@ neponset_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg
 
                 if (irr & IRR_SA1111) {
                         d = irq_desc + IRQ_NEPONSET_SA1111;
-                        d->handle(IRQ_NEPONSET_SA1111, d, regs);
+                        desc_handle_irq(IRQ_NEPONSET_SA1111, d, regs);
                 }
         }
 }
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index f01c0f8a2bb3..3c8862fde51a 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -108,7 +108,7 @@ sic_handle_irq(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
                 irq += IRQ_SIC_START;
 
                 desc = irq_desc + irq;
-                desc->handle(irq, desc, regs);
+                desc_handle_irq(irq, desc, regs);
         } while (status);
 }
 
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 1c85b4e536c2..aa481ea3d702 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -590,7 +590,7 @@ static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc,
                 if (!(isr & 1))
                         continue;
                 d = irq_desc + gpio_irq;
-                d->handle(gpio_irq, d, regs);
+                desc_handle_irq(gpio_irq, d, regs);
         }
 }