[ARM] 5298/1: Drop desc_handle_irq()

desc_handle_irq() was declared as obsolete since long ago.
Replace it with generic_handle_irq()

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 3 insertions, 9 deletions

diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c
index 68b4ac5b248..aa4c4420ff3 100644
--- a/arch/arm/mach-ixp23xx/core.c
+++ b/arch/arm/mach-ixp23xx/core.c
@@ -253,7 +253,6 @@ static void pci_handler(unsigned int irq, struct irq_desc *desc)
 {
         u32 pci_interrupt;
         unsigned int irqno;
-        struct irq_desc *int_desc;
 
         pci_interrupt = *IXP23XX_PCI_XSCALE_INT_STATUS;
 
@@ -268,8 +267,7 @@ static void pci_handler(unsigned int irq, struct irq_desc *desc)
                 BUG();
         }
 
-        int_desc = irq_desc + irqno;
-        desc_handle_irq(irqno, int_desc);
+        generic_handle_irq(irqno);
 
         desc->chip->unmask(irq);
 }
diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c
index b6e0bfa44df..f1b124a709a 100644
--- a/arch/arm/mach-ixp23xx/ixdp2351.c
+++ b/arch/arm/mach-ixp23xx/ixdp2351.c
@@ -68,11 +68,9 @@ static void ixdp2351_inta_handler(unsigned int irq, struct irq_desc *desc)
 
         for (i = 0; i < IXDP2351_INTA_IRQ_NUM; i++) {
                 if (ex_interrupt & (1 << i)) {
-                        struct irq_desc *cpld_desc;
                         int cpld_irq =
                                 IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE + i);
-                        cpld_desc = irq_desc + cpld_irq;
-                        desc_handle_irq(cpld_irq, cpld_desc);
+                        generic_handle_irq(cpld_irq);
                 }
         }
 
@@ -105,11 +103,9 @@ static void ixdp2351_intb_handler(unsigned int irq, struct irq_desc *desc)
 
         for (i = 0; i < IXDP2351_INTB_IRQ_NUM; i++) {
                 if (ex_interrupt & (1 << i)) {
-                        struct irq_desc *cpld_desc;
                         int cpld_irq =
                                 IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE + i);
-                        cpld_desc = irq_desc + cpld_irq;
-                        desc_handle_irq(cpld_irq, cpld_desc);
+                        generic_handle_irq(cpld_irq);
                 }
         }