diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2010-11-29 10:38:52 +0100 |
|---|---|---|
| committer | Lennert Buytenhek <buytenh@wantstofly.org> | 2011-01-13 17:18:50 +0100 |
| commit | 85dcd90ce11d24649906adc454f31f1ac3f2dc6a (patch) | |
| tree | 55fa0e9a2f4212e71815b537c68a127f557d78db | |
| parent | 9b3ffe523af895f6b969b971079da4c06c2743af (diff) | |
| download | op-kernel-dev-85dcd90ce11d24649906adc454f31f1ac3f2dc6a.zip op-kernel-dev-85dcd90ce11d24649906adc454f31f1ac3f2dc6a.tar.gz | |
ARM: nuc93x: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
| -rw-r--r-- | arch/arm/mach-nuc93x/irq.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-nuc93x/irq.c b/arch/arm/mach-nuc93x/irq.c index a7a88ea..1f8a05a 100644 --- a/arch/arm/mach-nuc93x/irq.c +++ b/arch/arm/mach-nuc93x/irq.c @@ -25,9 +25,9 @@ #include <mach/hardware.h> #include <mach/regs-irq.h> -static void nuc93x_irq_mask(unsigned int irq) +static void nuc93x_irq_mask(struct irq_data *d) { - __raw_writel(1 << irq, REG_AIC_MDCR); + __raw_writel(1 << d->irq, REG_AIC_MDCR); } /* @@ -35,21 +35,21 @@ static void nuc93x_irq_mask(unsigned int irq) * to REG_AIC_EOSCR for ACK */ -static void nuc93x_irq_ack(unsigned int irq) +static void nuc93x_irq_ack(struct irq_data *d) { __raw_writel(0x01, REG_AIC_EOSCR); } -static void nuc93x_irq_unmask(unsigned int irq) +static void nuc93x_irq_unmask(struct irq_data *d) { - __raw_writel(1 << irq, REG_AIC_MECR); + __raw_writel(1 << d->irq, REG_AIC_MECR); } static struct irq_chip nuc93x_irq_chip = { - .ack = nuc93x_irq_ack, - .mask = nuc93x_irq_mask, - .unmask = nuc93x_irq_unmask, + .irq_ack = nuc93x_irq_ack, + .irq_mask = nuc93x_irq_mask, + .irq_unmask = nuc93x_irq_unmask, }; void __init nuc93x_init_irq(void) |
