aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2010-11-29 05:15:19 -0500
committerLennert Buytenhek <buytenh@wantstofly.org>2011-01-13 11:19:07 -0500
commitb9858efad32ffa8b3e9c2bd1286121824c3cebae (patch)
tree52affc9a01d0451a29a2a15670c28bb7cfd67bbb /arch/arm
parent80cf22c4a6eedb312346b2b8574f35725c445ab0 (diff)
ARM: w90x900: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca> Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-w90x900/irq.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-w90x900/irq.c b/arch/arm/mach-w90x900/irq.c
index 0ce9d8e867eb..9c350103dcda 100644
--- a/arch/arm/mach-w90x900/irq.c
+++ b/arch/arm/mach-w90x900/irq.c
@@ -92,15 +92,15 @@ static void nuc900_group_enable(struct group_irq *gpirq, int enable)
92 __raw_writel(regval, REG_AIC_GEN); 92 __raw_writel(regval, REG_AIC_GEN);
93} 93}
94 94
95static void nuc900_irq_mask(unsigned int irq) 95static void nuc900_irq_mask(struct irq_data *d)
96{ 96{
97 struct group_irq *group_irq; 97 struct group_irq *group_irq;
98 98
99 group_irq = NULL; 99 group_irq = NULL;
100 100
101 __raw_writel(1 << irq, REG_AIC_MDCR); 101 __raw_writel(1 << d->irq, REG_AIC_MDCR);
102 102
103 switch (irq) { 103 switch (d->irq) {
104 case IRQ_GROUP0: 104 case IRQ_GROUP0:
105 group_irq = &group_nirq0; 105 group_irq = &group_nirq0;
106 break; 106 break;
@@ -143,20 +143,20 @@ static void nuc900_irq_mask(unsigned int irq)
143 * to REG_AIC_EOSCR for ACK 143 * to REG_AIC_EOSCR for ACK
144 */ 144 */
145 145
146static void nuc900_irq_ack(unsigned int irq) 146static void nuc900_irq_ack(struct irq_data *d)
147{ 147{
148 __raw_writel(0x01, REG_AIC_EOSCR); 148 __raw_writel(0x01, REG_AIC_EOSCR);
149} 149}
150 150
151static void nuc900_irq_unmask(unsigned int irq) 151static void nuc900_irq_unmask(struct irq_data *d)
152{ 152{
153 struct group_irq *group_irq; 153 struct group_irq *group_irq;
154 154
155 group_irq = NULL; 155 group_irq = NULL;
156 156
157 __raw_writel(1 << irq, REG_AIC_MECR); 157 __raw_writel(1 << d->irq, REG_AIC_MECR);
158 158
159 switch (irq) { 159 switch (d->irq) {
160 case IRQ_GROUP0: 160 case IRQ_GROUP0:
161 group_irq = &group_nirq0; 161 group_irq = &group_nirq0;
162 break; 162 break;
@@ -195,9 +195,9 @@ static void nuc900_irq_unmask(unsigned int irq)
195} 195}
196 196
197static struct irq_chip nuc900_irq_chip = { 197static struct irq_chip nuc900_irq_chip = {
198 .ack = nuc900_irq_ack, 198 .irq_ack = nuc900_irq_ack,
199 .mask = nuc900_irq_mask, 199 .irq_mask = nuc900_irq_mask,
200 .unmask = nuc900_irq_unmask, 200 .irq_unmask = nuc900_irq_unmask,
201}; 201};
202 202
203void __init nuc900_init_irq(void) 203void __init nuc900_init_irq(void)