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

1 files changed, 3 insertions, 8 deletions

diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
index 4856a6bd2482..6ccd175bc4cf 100644
--- a/arch/arm/mach-sa1100/neponset.c
+++ b/arch/arm/mach-sa1100/neponset.c
@@ -33,8 +33,6 @@ neponset_irq_handler(unsigned int irq, struct irq_desc *desc)
         unsigned int irr;
 
         while (1) {
-                struct irq_desc *d;
-
                 /*
                  * Acknowledge the parent IRQ.
                  */
@@ -67,21 +65,18 @@ neponset_irq_handler(unsigned int irq, struct irq_desc *desc)
                         desc->chip->ack(irq);
 
                         if (irr & IRR_ETHERNET) {
-                                d = irq_desc + IRQ_NEPONSET_SMC9196;
-                                desc_handle_irq(IRQ_NEPONSET_SMC9196, d);
+                                generic_handle_irq(IRQ_NEPONSET_SMC9196);
                         }
 
                         if (irr & IRR_USAR) {
-                                d = irq_desc + IRQ_NEPONSET_USAR;
-                                desc_handle_irq(IRQ_NEPONSET_USAR, d);
+                                generic_handle_irq(IRQ_NEPONSET_USAR);
                         }
 
                         desc->chip->unmask(irq);
                 }
 
                 if (irr & IRR_SA1111) {
-                        d = irq_desc + IRQ_NEPONSET_SA1111;
-                        desc_handle_irq(IRQ_NEPONSET_SA1111, d);
+                        generic_handle_irq(IRQ_NEPONSET_SA1111);
                 }
         }
 }