diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:53:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:59:54 -0400 |
commit | 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 (patch) | |
tree | cfd72be941ecd172627a06dd61d98b55cec63a39 /arch/arm/mach-ixp23xx/core.c | |
parent | da104a83692cf07434ab3b20bf10093bdbc3f97e (diff) |
Initial blind fixup for arm for irq changes
Untested, but this should fix up the bulk of the totally mechanical
issues, and should make the actual detail fixing easier.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/mach-ixp23xx/core.c')
-rw-r--r-- | arch/arm/mach-ixp23xx/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c index 566a07821c77..a704a1820048 100644 --- a/arch/arm/mach-ixp23xx/core.c +++ b/arch/arm/mach-ixp23xx/core.c | |||
@@ -251,7 +251,7 @@ static void ixp23xx_pci_irq_unmask(unsigned int irq) | |||
251 | /* | 251 | /* |
252 | * TODO: Should this just be done at ASM level? | 252 | * TODO: Should this just be done at ASM level? |
253 | */ | 253 | */ |
254 | static void pci_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) | 254 | static void pci_handler(unsigned int irq, struct irqdesc *desc) |
255 | { | 255 | { |
256 | u32 pci_interrupt; | 256 | u32 pci_interrupt; |
257 | unsigned int irqno; | 257 | unsigned int irqno; |
@@ -271,7 +271,7 @@ static void pci_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs * | |||
271 | } | 271 | } |
272 | 272 | ||
273 | int_desc = irq_desc + irqno; | 273 | int_desc = irq_desc + irqno; |
274 | desc_handle_irq(irqno, int_desc, regs); | 274 | desc_handle_irq(irqno, int_desc); |
275 | 275 | ||
276 | desc->chip->unmask(irq); | 276 | desc->chip->unmask(irq); |
277 | } | 277 | } |
@@ -348,12 +348,12 @@ ixp23xx_gettimeoffset(void) | |||
348 | } | 348 | } |
349 | 349 | ||
350 | static irqreturn_t | 350 | static irqreturn_t |
351 | ixp23xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 351 | ixp23xx_timer_interrupt(int irq, void *dev_id) |
352 | { | 352 | { |
353 | /* Clear Pending Interrupt by writing '1' to it */ | 353 | /* Clear Pending Interrupt by writing '1' to it */ |
354 | *IXP23XX_TIMER_STATUS = IXP23XX_TIMER1_INT_PEND; | 354 | *IXP23XX_TIMER_STATUS = IXP23XX_TIMER1_INT_PEND; |
355 | while ((signed long)(*IXP23XX_TIMER_CONT - next_jiffy_time) >= LATCH) { | 355 | while ((signed long)(*IXP23XX_TIMER_CONT - next_jiffy_time) >= LATCH) { |
356 | timer_tick(regs); | 356 | timer_tick(); |
357 | next_jiffy_time += LATCH; | 357 | next_jiffy_time += LATCH; |
358 | } | 358 | } |
359 | 359 | ||