1 files changed, 23 insertions, 23 deletions

diff --git a/arch/mips/ar7/irq.c b/arch/mips/ar7/irq.c
index 4ec2642c568f..03db3daadbd8 100644
--- a/arch/mips/ar7/irq.c
+++ b/arch/mips/ar7/irq.c
@@ -49,51 +49,51 @@
 
 static int ar7_irq_base;
 
-static void ar7_unmask_irq(unsigned int irq)
+static void ar7_unmask_irq(struct irq_data *d)
 {
-        writel(1 << ((irq - ar7_irq_base) % 32),
-               REG(ESR_OFFSET(irq - ar7_irq_base)));
+        writel(1 << ((d->irq - ar7_irq_base) % 32),
+               REG(ESR_OFFSET(d->irq - ar7_irq_base)));
 }
 
-static void ar7_mask_irq(unsigned int irq)
+static void ar7_mask_irq(struct irq_data *d)
 {
-        writel(1 << ((irq - ar7_irq_base) % 32),
-               REG(ECR_OFFSET(irq - ar7_irq_base)));
+        writel(1 << ((d->irq - ar7_irq_base) % 32),
+               REG(ECR_OFFSET(d->irq - ar7_irq_base)));
 }
 
-static void ar7_ack_irq(unsigned int irq)
+static void ar7_ack_irq(struct irq_data *d)
 {
-        writel(1 << ((irq - ar7_irq_base) % 32),
-               REG(CR_OFFSET(irq - ar7_irq_base)));
+        writel(1 << ((d->irq - ar7_irq_base) % 32),
+               REG(CR_OFFSET(d->irq - ar7_irq_base)));
 }
 
-static void ar7_unmask_sec_irq(unsigned int irq)
+static void ar7_unmask_sec_irq(struct irq_data *d)
 {
-        writel(1 << (irq - ar7_irq_base - 40), REG(SEC_ESR_OFFSET));
+        writel(1 << (d->irq - ar7_irq_base - 40), REG(SEC_ESR_OFFSET));
 }
 
-static void ar7_mask_sec_irq(unsigned int irq)
+static void ar7_mask_sec_irq(struct irq_data *d)
 {
-        writel(1 << (irq - ar7_irq_base - 40), REG(SEC_ECR_OFFSET));
+        writel(1 << (d->irq - ar7_irq_base - 40), REG(SEC_ECR_OFFSET));
 }
 
-static void ar7_ack_sec_irq(unsigned int irq)
+static void ar7_ack_sec_irq(struct irq_data *d)
 {
-        writel(1 << (irq - ar7_irq_base - 40), REG(SEC_CR_OFFSET));
+        writel(1 << (d->irq - ar7_irq_base - 40), REG(SEC_CR_OFFSET));
 }
 
 static struct irq_chip ar7_irq_type = {
         .name = "AR7",
-        .unmask = ar7_unmask_irq,
-        .mask = ar7_mask_irq,
-        .ack = ar7_ack_irq
+        .irq_unmask = ar7_unmask_irq,
+        .irq_mask = ar7_mask_irq,
+        .irq_ack = ar7_ack_irq
 };
 
 static struct irq_chip ar7_sec_irq_type = {
         .name = "AR7",
-        .unmask = ar7_unmask_sec_irq,
-        .mask = ar7_mask_sec_irq,
-        .ack = ar7_ack_sec_irq,
+        .irq_unmask = ar7_unmask_sec_irq,
+        .irq_mask = ar7_mask_sec_irq,
+        .irq_ack = ar7_ack_sec_irq,
 };
 
 static struct irqaction ar7_cascade_action = {
@@ -119,11 +119,11 @@ static void __init ar7_irq_init(int base)
         for (i = 0; i < 40; i++) {
                 writel(i, REG(CHNL_OFFSET(i)));
                 /* Primary IRQ's */
-                set_irq_chip_and_handler(base + i, &ar7_irq_type,
+                irq_set_chip_and_handler(base + i, &ar7_irq_type,
                                          handle_level_irq);
                 /* Secondary IRQ's */
                 if (i < 32)
-                        set_irq_chip_and_handler(base + i + 40,
+                        irq_set_chip_and_handler(base + i + 40,
                                                  &ar7_sec_irq_type,
                                                  handle_level_irq);
         }