diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-09-24 17:21:00 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-10-30 21:57:06 +0100 |
| commit | 42f1d57f055064ed320d7292b95819dd81dda409 (patch) | |
| tree | 41a9e7f841c59871e75abffdabb28f736e7d3183 /arch/m68k/mac | |
| parent | 09323308f63708d60aea9d5b9552ce759ef278dc (diff) | |
m68k: change remaining timers to legacy_timer_tick
There are nine more machines that each have their own timer interrupt
calling the m68k timer_interrupt() function through an indirect pointer.
This function is now the same as legacy_timer_tick, so just call that
directly and select the corresponding Kconfig symbol.
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/m68k/mac')
| -rw-r--r-- | arch/m68k/mac/via.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c index ac77d73af19a..ba444e1774b8 100644 --- a/arch/m68k/mac/via.c +++ b/arch/m68k/mac/via.c @@ -602,11 +602,9 @@ static u32 clk_total, clk_offset; static irqreturn_t via_timer_handler(int irq, void *dev_id) { - irq_handler_t timer_routine = dev_id; - clk_total += VIA_TIMER_CYCLES; clk_offset = 0; - timer_routine(0, NULL); + legacy_timer_tick(1); return IRQ_HANDLED; } @@ -614,7 +612,7 @@ static irqreturn_t via_timer_handler(int irq, void *dev_id) void __init via_init_clock(irq_handler_t timer_routine) { if (request_irq(IRQ_MAC_TIMER_1, via_timer_handler, IRQF_TIMER, "timer", - timer_routine)) { + NULL)) { pr_err("Couldn't register %s interrupt\n", "timer"); return; } |