linux-mips
[Top] [All Lists]

[patch 02/38] mips: ar7: Convert to new irq_chip functions

To: linux-mips@linux-mips.org
Subject: [patch 02/38] mips: ar7: Convert to new irq_chip functions
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 23 Mar 2011 21:08:46 -0000
Cc: Ralf Baechle <ralf@linux-mips.org>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20110323210437.398062704@linutronix.de>
Sender: linux-mips-bounce@linux-mips.org
User-agent: quilt/0.48-1
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/mips/ar7/irq.c |   42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

Index: linux-mips-next/arch/mips/ar7/irq.c
===================================================================
--- linux-mips-next.orig/arch/mips/ar7/irq.c
+++ linux-mips-next/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 = {



<Prev in Thread] Current Thread [Next in Thread>