[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>

3 files changed, 4 insertions, 10 deletions

diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index a6a4f93085fd..e193a34e4175 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -311,8 +311,7 @@ static void ixp2000_GPIO_irq_handler(unsigned int irq, struct irq_desc *desc)
                    
         for (i = 0; i <= 7; i++) {
                 if (status & (1<<i)) {
-                        desc = irq_desc + i + IRQ_IXP2000_GPIO0;
-                        desc_handle_irq(i + IRQ_IXP2000_GPIO0, desc);
+                        generic_handle_irq(i + IRQ_IXP2000_GPIO0);
                 }
         }
 }
@@ -404,8 +403,7 @@ static void ixp2000_err_irq_handler(unsigned int irq, struct irq_desc *desc)
 
         for(i = 31; i >= 0; i--) {
                 if(status & (1 << i)) {
-                        desc = irq_desc + IRQ_IXP2000_DRAM0_MIN_ERR + i;
-                        desc_handle_irq(IRQ_IXP2000_DRAM0_MIN_ERR + i, desc);
+                        generic_handle_irq(IRQ_IXP2000_DRAM0_MIN_ERR + i);
                 }
         }
 }
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c
index 5a781fd9757a..4c749d490241 100644
--- a/arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/arch/arm/mach-ixp2000/ixdp2x00.c
@@ -129,10 +129,8 @@ static void ixdp2x00_irq_handler(unsigned int irq, struct irq_desc *desc)
 
         for(i = 0; i < board_irq_count; i++) {
                 if(ex_interrupt & (1 << i))  {
-                        struct irq_desc *cpld_desc;
                         int cpld_irq = IXP2000_BOARD_IRQ(0) + i;
-                        cpld_desc = irq_desc + cpld_irq;
-                        desc_handle_irq(cpld_irq, cpld_desc);
+                        generic_handle_irq(cpld_irq);
                 }
         }
 
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index 78a2341dee2c..b78c08d1f638 100644
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -79,10 +79,8 @@ static void ixdp2x01_irq_handler(unsigned int irq, struct irq_desc *desc)
 
         for (i = 0; i < IXP2000_BOARD_IRQS; i++) {
                 if (ex_interrupt & (1 << i)) {
-                        struct irq_desc *cpld_desc;
                         int cpld_irq = IXP2000_BOARD_IRQ(0) + i;
-                        cpld_desc = irq_desc + cpld_irq;
-                        desc_handle_irq(cpld_irq, cpld_desc);
+                        generic_handle_irq(cpld_irq);
                 }
         }