diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-09-06 18:17:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 19:57:32 -0400 |
commit | 7f4bde9a3486cd7e70bedd2aff35b38667d50173 (patch) | |
tree | 594ef79e14e787196099985e58a9d6563659508d /arch/sh64/kernel/time.c | |
parent | 2832e9366a1fcd6f76957a42157be041240f994e (diff) |
[PATCH] remove the second arg of do_timer_interrupt()
The second arg of do_timer_interrupt() is not used in the functions, and
all callers pass NULL.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Paul Mundt <lethal@Linux-SH.ORG>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/sh64/kernel/time.c')
-rw-r--r-- | arch/sh64/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh64/kernel/time.c b/arch/sh64/kernel/time.c index 6c84da3efc73..926c6fc0619c 100644 --- a/arch/sh64/kernel/time.c +++ b/arch/sh64/kernel/time.c | |||
@@ -303,7 +303,7 @@ static long last_rtc_update = 0; | |||
303 | * timer_interrupt() needs to keep up the real-time clock, | 303 | * timer_interrupt() needs to keep up the real-time clock, |
304 | * as well as call the "do_timer()" routine every clocktick | 304 | * as well as call the "do_timer()" routine every clocktick |
305 | */ | 305 | */ |
306 | static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 306 | static inline void do_timer_interrupt(int irq, struct pt_regs *regs) |
307 | { | 307 | { |
308 | unsigned long long current_ctc; | 308 | unsigned long long current_ctc; |
309 | asm ("getcon cr62, %0" : "=r" (current_ctc)); | 309 | asm ("getcon cr62, %0" : "=r" (current_ctc)); |
@@ -361,7 +361,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
361 | * locally disabled. -arca | 361 | * locally disabled. -arca |
362 | */ | 362 | */ |
363 | write_lock(&xtime_lock); | 363 | write_lock(&xtime_lock); |
364 | do_timer_interrupt(irq, NULL, regs); | 364 | do_timer_interrupt(irq, regs); |
365 | write_unlock(&xtime_lock); | 365 | write_unlock(&xtime_lock); |
366 | 366 | ||
367 | return IRQ_HANDLED; | 367 | return IRQ_HANDLED; |