diff options
Diffstat (limited to 'arch/arm/plat-omap/timer32k.c')
-rw-r--r-- | arch/arm/plat-omap/timer32k.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/plat-omap/timer32k.c index cf6df3378d37..265310601161 100644 --- a/arch/arm/plat-omap/timer32k.c +++ b/arch/arm/plat-omap/timer32k.c | |||
@@ -194,8 +194,7 @@ unsigned long long sched_clock(void) | |||
194 | * issues with dynamic tick. In the dynamic tick case, we need to lock | 194 | * issues with dynamic tick. In the dynamic tick case, we need to lock |
195 | * with irqsave. | 195 | * with irqsave. |
196 | */ | 196 | */ |
197 | static inline irqreturn_t _omap_32k_timer_interrupt(int irq, void *dev_id, | 197 | static inline irqreturn_t _omap_32k_timer_interrupt(int irq, void *dev_id) |
198 | struct pt_regs *regs) | ||
199 | { | 198 | { |
200 | unsigned long now; | 199 | unsigned long now; |
201 | 200 | ||
@@ -205,7 +204,7 @@ static inline irqreturn_t _omap_32k_timer_interrupt(int irq, void *dev_id, | |||
205 | while ((signed long)(now - omap_32k_last_tick) | 204 | while ((signed long)(now - omap_32k_last_tick) |
206 | >= OMAP_32K_TICKS_PER_HZ) { | 205 | >= OMAP_32K_TICKS_PER_HZ) { |
207 | omap_32k_last_tick += OMAP_32K_TICKS_PER_HZ; | 206 | omap_32k_last_tick += OMAP_32K_TICKS_PER_HZ; |
208 | timer_tick(regs); | 207 | timer_tick(); |
209 | } | 208 | } |
210 | 209 | ||
211 | /* Restart timer so we don't drift off due to modulo or dynamic tick. | 210 | /* Restart timer so we don't drift off due to modulo or dynamic tick. |
@@ -218,19 +217,17 @@ static inline irqreturn_t _omap_32k_timer_interrupt(int irq, void *dev_id, | |||
218 | return IRQ_HANDLED; | 217 | return IRQ_HANDLED; |
219 | } | 218 | } |
220 | 219 | ||
221 | static irqreturn_t omap_32k_timer_handler(int irq, void *dev_id, | 220 | static irqreturn_t omap_32k_timer_handler(int irq, void *dev_id) |
222 | struct pt_regs *regs) | ||
223 | { | 221 | { |
224 | return _omap_32k_timer_interrupt(irq, dev_id, regs); | 222 | return _omap_32k_timer_interrupt(irq, dev_id); |
225 | } | 223 | } |
226 | 224 | ||
227 | static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id, | 225 | static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id) |
228 | struct pt_regs *regs) | ||
229 | { | 226 | { |
230 | unsigned long flags; | 227 | unsigned long flags; |
231 | 228 | ||
232 | write_seqlock_irqsave(&xtime_lock, flags); | 229 | write_seqlock_irqsave(&xtime_lock, flags); |
233 | _omap_32k_timer_interrupt(irq, dev_id, regs); | 230 | _omap_32k_timer_interrupt(irq, dev_id); |
234 | write_sequnlock_irqrestore(&xtime_lock, flags); | 231 | write_sequnlock_irqrestore(&xtime_lock, flags); |
235 | 232 | ||
236 | return IRQ_HANDLED; | 233 | return IRQ_HANDLED; |