diff options
Diffstat (limited to 'arch/arm/mach-ixp2000/core.c')
-rw-r--r-- | arch/arm/mach-ixp2000/core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c index 7f91f689a041..22c98e9dad28 100644 --- a/arch/arm/mach-ixp2000/core.c +++ b/arch/arm/mach-ixp2000/core.c | |||
@@ -204,7 +204,7 @@ unsigned long ixp2000_gettimeoffset (void) | |||
204 | return offset / ticks_per_usec; | 204 | return offset / ticks_per_usec; |
205 | } | 205 | } |
206 | 206 | ||
207 | static int ixp2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 207 | static int ixp2000_timer_interrupt(int irq, void *dev_id) |
208 | { | 208 | { |
209 | write_seqlock(&xtime_lock); | 209 | write_seqlock(&xtime_lock); |
210 | 210 | ||
@@ -213,7 +213,7 @@ static int ixp2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
213 | 213 | ||
214 | while ((signed long)(next_jiffy_time - *missing_jiffy_timer_csr) | 214 | while ((signed long)(next_jiffy_time - *missing_jiffy_timer_csr) |
215 | >= ticks_per_jiffy) { | 215 | >= ticks_per_jiffy) { |
216 | timer_tick(regs); | 216 | timer_tick(); |
217 | next_jiffy_time -= ticks_per_jiffy; | 217 | next_jiffy_time -= ticks_per_jiffy; |
218 | } | 218 | } |
219 | 219 | ||
@@ -308,7 +308,7 @@ EXPORT_SYMBOL(gpio_line_config); | |||
308 | /************************************************************************* | 308 | /************************************************************************* |
309 | * IRQ handling IXP2000 | 309 | * IRQ handling IXP2000 |
310 | *************************************************************************/ | 310 | *************************************************************************/ |
311 | static void ixp2000_GPIO_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) | 311 | static void ixp2000_GPIO_irq_handler(unsigned int irq, struct irqdesc *desc) |
312 | { | 312 | { |
313 | int i; | 313 | int i; |
314 | unsigned long status = *IXP2000_GPIO_INST; | 314 | unsigned long status = *IXP2000_GPIO_INST; |
@@ -316,7 +316,7 @@ static void ixp2000_GPIO_irq_handler(unsigned int irq, struct irqdesc *desc, str | |||
316 | for (i = 0; i <= 7; i++) { | 316 | for (i = 0; i <= 7; i++) { |
317 | if (status & (1<<i)) { | 317 | if (status & (1<<i)) { |
318 | desc = irq_desc + i + IRQ_IXP2000_GPIO0; | 318 | desc = irq_desc + i + IRQ_IXP2000_GPIO0; |
319 | desc_handle_irq(i + IRQ_IXP2000_GPIO0, desc, regs); | 319 | desc_handle_irq(i + IRQ_IXP2000_GPIO0, desc); |
320 | } | 320 | } |
321 | } | 321 | } |
322 | } | 322 | } |
@@ -401,7 +401,7 @@ static void ixp2000_pci_irq_unmask(unsigned int irq) | |||
401 | /* | 401 | /* |
402 | * Error interrupts. These are used extensively by the microengine drivers | 402 | * Error interrupts. These are used extensively by the microengine drivers |
403 | */ | 403 | */ |
404 | static void ixp2000_err_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) | 404 | static void ixp2000_err_irq_handler(unsigned int irq, struct irqdesc *desc) |
405 | { | 405 | { |
406 | int i; | 406 | int i; |
407 | unsigned long status = *IXP2000_IRQ_ERR_STATUS; | 407 | unsigned long status = *IXP2000_IRQ_ERR_STATUS; |
@@ -409,7 +409,7 @@ static void ixp2000_err_irq_handler(unsigned int irq, struct irqdesc *desc, str | |||
409 | for(i = 31; i >= 0; i--) { | 409 | for(i = 31; i >= 0; i--) { |
410 | if(status & (1 << i)) { | 410 | if(status & (1 << i)) { |
411 | desc = irq_desc + IRQ_IXP2000_DRAM0_MIN_ERR + i; | 411 | desc = irq_desc + IRQ_IXP2000_DRAM0_MIN_ERR + i; |
412 | desc_handle_irq(IRQ_IXP2000_DRAM0_MIN_ERR + i, desc, regs); | 412 | desc_handle_irq(IRQ_IXP2000_DRAM0_MIN_ERR + i, desc); |
413 | } | 413 | } |
414 | } | 414 | } |
415 | } | 415 | } |