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

diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/plat-omap/timer32k.c
index 27ee80d3244de667adf6c8e0bf6bc25d1689234e..c37d7b4118392de3085b4947d19e4d1c8fb39fef 100644 (file)
--- a/arch/arm/plat-omap/timer32k.c
+++ b/arch/arm/plat-omap/timer32k.c
@@ -194,8 +194,7 @@ unsigned long long sched_clock(void)
  * issues with dynamic tick. In the dynamic tick case, we need to lock
  * with irqsave.
  */
-static inline irqreturn_t _omap_32k_timer_interrupt(int irq, void *dev_id,
-                                       struct pt_regs *regs)
+static inline irqreturn_t _omap_32k_timer_interrupt(int irq, void *dev_id)
 {
        unsigned long now;
 
@@ -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)
                                                >= 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.
@@ -218,8 +217,7 @@ static inline irqreturn_t _omap_32k_timer_interrupt(int irq, void *dev_id,
        return IRQ_HANDLED;
 }
 
-static irqreturn_t omap_32k_timer_handler(int irq, void *dev_id,
-                                       struct pt_regs *regs)
+static irqreturn_t omap_32k_timer_handler(int irq, void *dev_id)
 {
        unsigned long now;
 
@@ -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)
                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,
-                                           struct pt_regs *regs)
+static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id)
 {
        unsigned long 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);
 
        return IRQ_HANDLED;