Skip to content

L
linux-davinci
Commit c2411bff authored by Tony Lindgren's avatar Tony Lindgren
Browse files
Options

Sync with mainline: arch/arm/plat-omap/timer32k.c

parent 28c6715d
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
arch/arm/plat-omap/timer32k.c
View file @ c2411bff
...@@ -194,8 +194,7 @@ unsigned long long sched_clock(void) ...@@ -194,8 +194,7 @@ unsigned long long sched_clock(void)
* issues with dynamic tick. In the dynamic tick case, we need to lock * issues with dynamic tick. In the dynamic tick case, we need to lock
* with irqsave. * with irqsave.
*/ */
static inline irqreturn_t _omap_32k_timer_interrupt(int irq, void *dev_id, static inline irqreturn_t _omap_32k_timer_interrupt(int irq, void *dev_id)
struct pt_regs *regs)
{ {
unsigned long now; unsigned long now;
...@@ -205,7 +204,7 @@ static inline irqreturn_t _omap_32k_timer_interrupt(int irq, void *dev_id, ...@@ -205,7 +204,7 @@ static inline irqreturn_t _omap_32k_timer_interrupt(int irq, void *dev_id,
while ((signed long)(now - omap_32k_last_tick) while ((signed long)(now - omap_32k_last_tick)
>= OMAP_32K_TICKS_PER_HZ) { >= OMAP_32K_TICKS_PER_HZ) {
omap_32k_last_tick += OMAP_32K_TICKS_PER_HZ; omap_32k_last_tick += OMAP_32K_TICKS_PER_HZ;
timer_tick(regs); timer_tick();
} }
/* Restart timer so we don't drift off due to modulo or dynamic tick. /* Restart timer so we don't drift off due to modulo or dynamic tick.
...@@ -218,8 +217,7 @@ static inline irqreturn_t _omap_32k_timer_interrupt(int irq, void *dev_id, ...@@ -218,8 +217,7 @@ static inline irqreturn_t _omap_32k_timer_interrupt(int irq, void *dev_id,
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static irqreturn_t omap_32k_timer_handler(int irq, void *dev_id, static irqreturn_t omap_32k_timer_handler(int irq, void *dev_id)
struct pt_regs *regs)
{ {
unsigned long now; unsigned long now;
...@@ -232,16 +230,15 @@ static irqreturn_t omap_32k_timer_handler(int irq, void *dev_id, ...@@ -232,16 +230,15 @@ static irqreturn_t omap_32k_timer_handler(int irq, void *dev_id,
if (now - omap_32k_last_tick < OMAP_32K_TICKS_PER_HZ) if (now - omap_32k_last_tick < OMAP_32K_TICKS_PER_HZ)
return IRQ_HANDLED; return IRQ_HANDLED;
return _omap_32k_timer_interrupt(irq, dev_id, regs); return _omap_32k_timer_interrupt(irq, dev_id);
} }
static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id, static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id)
struct pt_regs *regs)
{ {
unsigned long flags; unsigned long flags;
write_seqlock_irqsave(&xtime_lock, flags); write_seqlock_irqsave(&xtime_lock, flags);
_omap_32k_timer_interrupt(irq, dev_id, regs); _omap_32k_timer_interrupt(irq, dev_id);
write_sequnlock_irqrestore(&xtime_lock, flags); write_sequnlock_irqrestore(&xtime_lock, flags);
return IRQ_HANDLED; return IRQ_HANDLED;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment