MIPS: rm7000: Convert to new irq_chip functions

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

diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c
index 9731e8b..fd24fd9 100644 (file)
--- a/arch/mips/kernel/irq-rm7000.c
+++ b/arch/mips/kernel/irq-rm7000.c
@@ -18,23 +18,23 @@
 #include <asm/mipsregs.h>
 #include <asm/system.h>
 
-static inline void unmask_rm7k_irq(unsigned int irq)
+static inline void unmask_rm7k_irq(struct irq_data *d)
 {
-       set_c0_intcontrol(0x100 << (irq - RM7K_CPU_IRQ_BASE));
+       set_c0_intcontrol(0x100 << (d->irq - RM7K_CPU_IRQ_BASE));
 }
 
-static inline void mask_rm7k_irq(unsigned int irq)
+static inline void mask_rm7k_irq(struct irq_data *d)
 {
-       clear_c0_intcontrol(0x100 << (irq - RM7K_CPU_IRQ_BASE));
+       clear_c0_intcontrol(0x100 << (d->irq - RM7K_CPU_IRQ_BASE));
 }
 
 static struct irq_chip rm7k_irq_controller = {
        .name = "RM7000",
-       .ack = mask_rm7k_irq,
-       .mask = mask_rm7k_irq,
-       .mask_ack = mask_rm7k_irq,
-       .unmask = unmask_rm7k_irq,
-       .eoi    = unmask_rm7k_irq
+       .irq_ack = mask_rm7k_irq,
+       .irq_mask = mask_rm7k_irq,
+       .irq_mask_ack = mask_rm7k_irq,
+       .irq_unmask = unmask_rm7k_irq,
+       .irq_eoi = unmask_rm7k_irq
 };
 
 void __init rm7k_cpu_irq_init(void)