diff options
Diffstat (limited to 'arch/arm/common/locomo.c')
-rw-r--r-- | arch/arm/common/locomo.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index 181ef1ead5b8..80a72c75214f 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c | |||
@@ -163,8 +163,7 @@ static struct locomo_dev_info locomo_devices[] = { | |||
163 | #define LOCOMO_IRQ_LT_START (IRQ_LOCOMO_LT) | 163 | #define LOCOMO_IRQ_LT_START (IRQ_LOCOMO_LT) |
164 | #define LOCOMO_IRQ_SPI_START (IRQ_LOCOMO_SPI_RFR) | 164 | #define LOCOMO_IRQ_SPI_START (IRQ_LOCOMO_SPI_RFR) |
165 | 165 | ||
166 | static void locomo_handler(unsigned int irq, struct irqdesc *desc, | 166 | static void locomo_handler(unsigned int irq, struct irqdesc *desc) |
167 | struct pt_regs *regs) | ||
168 | { | 167 | { |
169 | int req, i; | 168 | int req, i; |
170 | struct irqdesc *d; | 169 | struct irqdesc *d; |
@@ -182,7 +181,7 @@ static void locomo_handler(unsigned int irq, struct irqdesc *desc, | |||
182 | d = irq_desc + irq; | 181 | d = irq_desc + irq; |
183 | for (i = 0; i <= 3; i++, d++, irq++) { | 182 | for (i = 0; i <= 3; i++, d++, irq++) { |
184 | if (req & (0x0100 << i)) { | 183 | if (req & (0x0100 << i)) { |
185 | desc_handle_irq(irq, d, regs); | 184 | desc_handle_irq(irq, d); |
186 | } | 185 | } |
187 | 186 | ||
188 | } | 187 | } |
@@ -218,15 +217,14 @@ static struct irq_chip locomo_chip = { | |||
218 | .unmask = locomo_unmask_irq, | 217 | .unmask = locomo_unmask_irq, |
219 | }; | 218 | }; |
220 | 219 | ||
221 | static void locomo_key_handler(unsigned int irq, struct irqdesc *desc, | 220 | static void locomo_key_handler(unsigned int irq, struct irqdesc *desc) |
222 | struct pt_regs *regs) | ||
223 | { | 221 | { |
224 | struct irqdesc *d; | 222 | struct irqdesc *d; |
225 | void __iomem *mapbase = get_irq_chipdata(irq); | 223 | void __iomem *mapbase = get_irq_chipdata(irq); |
226 | 224 | ||
227 | if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) & 0x0001) { | 225 | if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) & 0x0001) { |
228 | d = irq_desc + LOCOMO_IRQ_KEY_START; | 226 | d = irq_desc + LOCOMO_IRQ_KEY_START; |
229 | desc_handle_irq(LOCOMO_IRQ_KEY_START, d, regs); | 227 | desc_handle_irq(LOCOMO_IRQ_KEY_START, d); |
230 | } | 228 | } |
231 | } | 229 | } |
232 | 230 | ||
@@ -264,8 +262,7 @@ static struct irq_chip locomo_key_chip = { | |||
264 | .unmask = locomo_key_unmask_irq, | 262 | .unmask = locomo_key_unmask_irq, |
265 | }; | 263 | }; |
266 | 264 | ||
267 | static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc, | 265 | static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc) |
268 | struct pt_regs *regs) | ||
269 | { | 266 | { |
270 | int req, i; | 267 | int req, i; |
271 | struct irqdesc *d; | 268 | struct irqdesc *d; |
@@ -280,7 +277,7 @@ static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc, | |||
280 | d = irq_desc + LOCOMO_IRQ_GPIO_START; | 277 | d = irq_desc + LOCOMO_IRQ_GPIO_START; |
281 | for (i = 0; i <= 15; i++, irq++, d++) { | 278 | for (i = 0; i <= 15; i++, irq++, d++) { |
282 | if (req & (0x0001 << i)) { | 279 | if (req & (0x0001 << i)) { |
283 | desc_handle_irq(irq, d, regs); | 280 | desc_handle_irq(irq, d); |
284 | } | 281 | } |
285 | } | 282 | } |
286 | } | 283 | } |
@@ -328,15 +325,14 @@ static struct irq_chip locomo_gpio_chip = { | |||
328 | .unmask = locomo_gpio_unmask_irq, | 325 | .unmask = locomo_gpio_unmask_irq, |
329 | }; | 326 | }; |
330 | 327 | ||
331 | static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc, | 328 | static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc) |
332 | struct pt_regs *regs) | ||
333 | { | 329 | { |
334 | struct irqdesc *d; | 330 | struct irqdesc *d; |
335 | void __iomem *mapbase = get_irq_chipdata(irq); | 331 | void __iomem *mapbase = get_irq_chipdata(irq); |
336 | 332 | ||
337 | if (locomo_readl(mapbase + LOCOMO_LTINT) & 0x0001) { | 333 | if (locomo_readl(mapbase + LOCOMO_LTINT) & 0x0001) { |
338 | d = irq_desc + LOCOMO_IRQ_LT_START; | 334 | d = irq_desc + LOCOMO_IRQ_LT_START; |
339 | desc_handle_irq(LOCOMO_IRQ_LT_START, d, regs); | 335 | desc_handle_irq(LOCOMO_IRQ_LT_START, d); |
340 | } | 336 | } |
341 | } | 337 | } |
342 | 338 | ||
@@ -374,8 +370,7 @@ static struct irq_chip locomo_lt_chip = { | |||
374 | .unmask = locomo_lt_unmask_irq, | 370 | .unmask = locomo_lt_unmask_irq, |
375 | }; | 371 | }; |
376 | 372 | ||
377 | static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc, | 373 | static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc) |
378 | struct pt_regs *regs) | ||
379 | { | 374 | { |
380 | int req, i; | 375 | int req, i; |
381 | struct irqdesc *d; | 376 | struct irqdesc *d; |
@@ -388,7 +383,7 @@ static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc, | |||
388 | 383 | ||
389 | for (i = 0; i <= 3; i++, irq++, d++) { | 384 | for (i = 0; i <= 3; i++, irq++, d++) { |
390 | if (req & (0x0001 << i)) { | 385 | if (req & (0x0001 << i)) { |
391 | desc_handle_irq(irq, d, regs); | 386 | desc_handle_irq(irq, d); |
392 | } | 387 | } |
393 | } | 388 | } |
394 | } | 389 | } |