MIPS: VR41xx: Convert to new irq_chip functions

And cleanup direct access to irq_desc[].

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2208/
Patchwork: https://patchwork.linux-mips.org/patch/2209/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 10 insertions, 9 deletions

diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
index 0975eb72d385..9ff7f397c0e1 100644
--- a/arch/mips/vr41xx/common/irq.c
+++ b/arch/mips/vr41xx/common/irq.c
@@ -62,7 +62,6 @@ EXPORT_SYMBOL_GPL(cascade_irq);
 static void irq_dispatch(unsigned int irq)
 {
         irq_cascade_t *cascade;
-        struct irq_desc *desc;
 
         if (irq >= NR_IRQS) {
                 atomic_inc(&irq_err_count);
@@ -71,14 +70,16 @@ static void irq_dispatch(unsigned int irq)
 
         cascade = irq_cascade + irq;
         if (cascade->get_irq != NULL) {
-                unsigned int source_irq = irq;
+                struct irq_desc *desc = irq_to_desc(irq);
+                struct irq_data *idata = irq_desc_get_irq_data(desc);
+                struct irq_chip *chip = irq_desc_get_chip(desc);
                 int ret;
-                desc = irq_desc + source_irq;
-                if (desc->chip->mask_ack)
-                        desc->chip->mask_ack(source_irq);
+
+                if (chip->irq_mask_ack)
+                        chip->irq_mask_ack(idata);
                 else {
-                        desc->chip->mask(source_irq);
-                        desc->chip->ack(source_irq);
+                        chip->irq_mask(idata);
+                        chip->irq_ack(idata);
                 }
                 ret = cascade->get_irq(irq);
                 irq = ret;
@@ -86,8 +87,8 @@ static void irq_dispatch(unsigned int irq)
                         atomic_inc(&irq_err_count);
                 else
                         irq_dispatch(irq);
-                if (!(desc->status & IRQ_DISABLED) && desc->chip->unmask)
-                        desc->chip->unmask(source_irq);
+                if (!(desc->status & IRQ_DISABLED) && chip->irq_unmask)
+                        chip->irq_unmask(idata);
         } else
                 do_IRQ(irq);
 }