diff options
Diffstat (limited to 'arch/arm/mach-sa1100/time.c')
-rw-r--r-- | arch/arm/mach-sa1100/time.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c index 49ae716e16c2..4284bd6f7a1f 100644 --- a/arch/arm/mach-sa1100/time.c +++ b/arch/arm/mach-sa1100/time.c | |||
@@ -77,7 +77,7 @@ static int match_posponed; | |||
77 | #endif | 77 | #endif |
78 | 78 | ||
79 | static irqreturn_t | 79 | static irqreturn_t |
80 | sa1100_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 80 | sa1100_timer_interrupt(int irq, void *dev_id) |
81 | { | 81 | { |
82 | unsigned int next_match; | 82 | unsigned int next_match; |
83 | 83 | ||
@@ -99,7 +99,7 @@ sa1100_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
99 | * handlers. | 99 | * handlers. |
100 | */ | 100 | */ |
101 | do { | 101 | do { |
102 | timer_tick(regs); | 102 | timer_tick(); |
103 | OSSR = OSSR_M0; /* Clear match on timer 0 */ | 103 | OSSR = OSSR_M0; /* Clear match on timer 0 */ |
104 | next_match = (OSMR0 += LATCH); | 104 | next_match = (OSMR0 += LATCH); |
105 | } while ((signed long)(next_match - OSCR) <= 0); | 105 | } while ((signed long)(next_match - OSCR) <= 0); |
@@ -151,13 +151,13 @@ static void sa1100_dyn_tick_reprogram(unsigned long ticks) | |||
151 | } | 151 | } |
152 | 152 | ||
153 | static irqreturn_t | 153 | static irqreturn_t |
154 | sa1100_dyn_tick_handler(int irq, void *dev_id, struct pt_regs *regs) | 154 | sa1100_dyn_tick_handler(int irq, void *dev_id) |
155 | { | 155 | { |
156 | if (match_posponed) { | 156 | if (match_posponed) { |
157 | match_posponed = 0; | 157 | match_posponed = 0; |
158 | OSMR0 = initial_match; | 158 | OSMR0 = initial_match; |
159 | if ((signed long)(initial_match - OSCR) <= 0) | 159 | if ((signed long)(initial_match - OSCR) <= 0) |
160 | return sa1100_timer_interrupt(irq, dev_id, regs); | 160 | return sa1100_timer_interrupt(irq, dev_id); |
161 | } | 161 | } |
162 | return IRQ_NONE; | 162 | return IRQ_NONE; |
163 | } | 163 | } |