1 files changed, 10 insertions, 13 deletions

diff --git a/arch/mips/dec/kn02-irq.c b/arch/mips/dec/kn02-irq.c
index ed90a8deabc..ef31d98c4fb 100644
--- a/arch/mips/dec/kn02-irq.c
+++ b/arch/mips/dec/kn02-irq.c
@@ -27,43 +27,40 @@
  */
 u32 cached_kn02_csr;
 
-
 static int kn02_irq_base;
 
-
-static inline void unmask_kn02_irq(unsigned int irq)
+static void unmask_kn02_irq(struct irq_data *d)
 {
         volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE +
                                                        KN02_CSR);
 
-        cached_kn02_csr |= (1 << (irq - kn02_irq_base + 16));
+        cached_kn02_csr |= (1 << (d->irq - kn02_irq_base + 16));
         *csr = cached_kn02_csr;
 }
 
-static inline void mask_kn02_irq(unsigned int irq)
+static void mask_kn02_irq(struct irq_data *d)
 {
         volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE +
                                                        KN02_CSR);
 
-        cached_kn02_csr &= ~(1 << (irq - kn02_irq_base + 16));
+        cached_kn02_csr &= ~(1 << (d->irq - kn02_irq_base + 16));
         *csr = cached_kn02_csr;
 }
 
-static void ack_kn02_irq(unsigned int irq)
+static void ack_kn02_irq(struct irq_data *d)
 {
-        mask_kn02_irq(irq);
+        mask_kn02_irq(d);
         iob();
 }
 
 static struct irq_chip kn02_irq_type = {
         .name = "KN02-CSR",
-        .ack = ack_kn02_irq,
-        .mask = mask_kn02_irq,
-        .mask_ack = ack_kn02_irq,
-        .unmask = unmask_kn02_irq,
+        .irq_ack = ack_kn02_irq,
+        .irq_mask = mask_kn02_irq,
+        .irq_mask_ack = ack_kn02_irq,
+        .irq_unmask = unmask_kn02_irq,
 };
 
-
 void __init init_kn02_irqs(int base)
 {
         volatile u32 *csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE +