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-pxa/time.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-pxa/time.c')
-rw-r--r-- | arch/arm/mach-pxa/time.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index 5dbd191c57c4..3ac268fa419b 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
@@ -75,7 +75,7 @@ static int match_posponed; | |||
75 | #endif | 75 | #endif |
76 | 76 | ||
77 | static irqreturn_t | 77 | static irqreturn_t |
78 | pxa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 78 | pxa_timer_interrupt(int irq, void *dev_id) |
79 | { | 79 | { |
80 | int next_match; | 80 | int next_match; |
81 | 81 | ||
@@ -105,7 +105,7 @@ pxa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
105 | * exactly one tick period which should be a pretty rare event. | 105 | * exactly one tick period which should be a pretty rare event. |
106 | */ | 106 | */ |
107 | do { | 107 | do { |
108 | timer_tick(regs); | 108 | timer_tick(); |
109 | OSSR = OSSR_M0; /* Clear match on timer 0 */ | 109 | OSSR = OSSR_M0; /* Clear match on timer 0 */ |
110 | next_match = (OSMR0 += LATCH); | 110 | next_match = (OSMR0 += LATCH); |
111 | } while( (signed long)(next_match - OSCR) <= 8 ); | 111 | } while( (signed long)(next_match - OSCR) <= 8 ); |
@@ -157,13 +157,13 @@ static void pxa_dyn_tick_reprogram(unsigned long ticks) | |||
157 | } | 157 | } |
158 | 158 | ||
159 | static irqreturn_t | 159 | static irqreturn_t |
160 | pxa_dyn_tick_handler(int irq, void *dev_id, struct pt_regs *regs) | 160 | pxa_dyn_tick_handler(int irq, void *dev_id) |
161 | { | 161 | { |
162 | if (match_posponed) { | 162 | if (match_posponed) { |
163 | match_posponed = 0; | 163 | match_posponed = 0; |
164 | OSMR0 = initial_match; | 164 | OSMR0 = initial_match; |
165 | if ( (signed long)(initial_match - OSCR) <= 8 ) | 165 | if ( (signed long)(initial_match - OSCR) <= 8 ) |
166 | return pxa_timer_interrupt(irq, dev_id, regs); | 166 | return pxa_timer_interrupt(irq, dev_id); |
167 | } | 167 | } |
168 | return IRQ_NONE; | 168 | return IRQ_NONE; |
169 | } | 169 | } |