MIPS: TXx9: 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/2207/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 6 insertions, 8 deletions

diff --git a/arch/mips/txx9/rbtx4939/irq.c b/arch/mips/txx9/rbtx4939/irq.c
index 57fa740a7205..70074632fb99 100644
--- a/arch/mips/txx9/rbtx4939/irq.c
+++ b/arch/mips/txx9/rbtx4939/irq.c
@@ -19,16 +19,16 @@
  * RBTX4939 IOC controller definition
  */
 
-static void rbtx4939_ioc_irq_unmask(unsigned int irq)
+static void rbtx4939_ioc_irq_unmask(struct irq_data *d)
 {
-        int ioc_nr = irq - RBTX4939_IRQ_IOC;
+        int ioc_nr = d->irq - RBTX4939_IRQ_IOC;
 
         writeb(readb(rbtx4939_ien_addr) | (1 << ioc_nr), rbtx4939_ien_addr);
 }
 
-static void rbtx4939_ioc_irq_mask(unsigned int irq)
+static void rbtx4939_ioc_irq_mask(struct irq_data *d)
 {
-        int ioc_nr = irq - RBTX4939_IRQ_IOC;
+        int ioc_nr = d->irq - RBTX4939_IRQ_IOC;
 
         writeb(readb(rbtx4939_ien_addr) & ~(1 << ioc_nr), rbtx4939_ien_addr);
         mmiowb();
@@ -36,10 +36,8 @@ static void rbtx4939_ioc_irq_mask(unsigned int irq)
 
 static struct irq_chip rbtx4939_ioc_irq_chip = {
         .name           = "IOC",
-        .ack            = rbtx4939_ioc_irq_mask,
-        .mask           = rbtx4939_ioc_irq_mask,
-        .mask_ack       = rbtx4939_ioc_irq_mask,
-        .unmask         = rbtx4939_ioc_irq_unmask,
+        .irq_mask       = rbtx4939_ioc_irq_mask,
+        .irq_unmask     = rbtx4939_ioc_irq_unmask,
 };