diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2010-11-29 04:38:52 -0500 |
---|---|---|
committer | Lennert Buytenhek <buytenh@wantstofly.org> | 2011-01-13 11:18:50 -0500 |
commit | 85dcd90ce11d24649906adc454f31f1ac3f2dc6a (patch) | |
tree | 55fa0e9a2f4212e71815b537c68a127f557d78db /arch/arm/mach-nuc93x | |
parent | 9b3ffe523af895f6b969b971079da4c06c2743af (diff) |
ARM: nuc93x: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Diffstat (limited to 'arch/arm/mach-nuc93x')
-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 a7a88ea4ec31..1f8a05a22834 100644 --- a/arch/arm/mach-nuc93x/irq.c +++ b/arch/arm/mach-nuc93x/irq.c | |||
@@ -25,9 +25,9 @@ | |||
25 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
26 | #include <mach/regs-irq.h> | 26 | #include <mach/regs-irq.h> |
27 | 27 | ||
28 | static void nuc93x_irq_mask(unsigned int irq) | 28 | static void nuc93x_irq_mask(struct irq_data *d) |
29 | { | 29 | { |
30 | __raw_writel(1 << irq, REG_AIC_MDCR); | 30 | __raw_writel(1 << d->irq, REG_AIC_MDCR); |
31 | } | 31 | } |
32 | 32 | ||
33 | /* | 33 | /* |
@@ -35,21 +35,21 @@ static void nuc93x_irq_mask(unsigned int irq) | |||
35 | * to REG_AIC_EOSCR for ACK | 35 | * to REG_AIC_EOSCR for ACK |
36 | */ | 36 | */ |
37 | 37 | ||
38 | static void nuc93x_irq_ack(unsigned int irq) | 38 | static void nuc93x_irq_ack(struct irq_data *d) |
39 | { | 39 | { |
40 | __raw_writel(0x01, REG_AIC_EOSCR); | 40 | __raw_writel(0x01, REG_AIC_EOSCR); |
41 | } | 41 | } |
42 | 42 | ||
43 | static void nuc93x_irq_unmask(unsigned int irq) | 43 | static void nuc93x_irq_unmask(struct irq_data *d) |
44 | { | 44 | { |
45 | __raw_writel(1 << irq, REG_AIC_MECR); | 45 | __raw_writel(1 << d->irq, REG_AIC_MECR); |
46 | 46 | ||
47 | } | 47 | } |
48 | 48 | ||
49 | static struct irq_chip nuc93x_irq_chip = { | 49 | static struct irq_chip nuc93x_irq_chip = { |
50 | .ack = nuc93x_irq_ack, | 50 | .irq_ack = nuc93x_irq_ack, |
51 | .mask = nuc93x_irq_mask, | 51 | .irq_mask = nuc93x_irq_mask, |
52 | .unmask = nuc93x_irq_unmask, | 52 | .irq_unmask = nuc93x_irq_unmask, |
53 | }; | 53 | }; |
54 | 54 | ||
55 | void __init nuc93x_init_irq(void) | 55 | void __init nuc93x_init_irq(void) |