diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-09-24 18:21:00 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-10-30 23:57:06 +0300 |
| commit | 42f1d57f055064ed320d7292b95819dd81dda409 (patch) | |
| tree | 41a9e7f841c59871e75abffdabb28f736e7d3183 /arch/m68k/amiga | |
| parent | 09323308f63708d60aea9d5b9552ce759ef278dc (diff) | |
| download | linux-42f1d57f055064ed320d7292b95819dd81dda409.tar.xz | |
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/amiga')
| -rw-r--r-- | arch/m68k/amiga/config.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index 29f92333119e..91dc87b86411 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c @@ -475,11 +475,9 @@ static u32 clk_total, clk_offset; static irqreturn_t ciab_timer_handler(int irq, void *dev_id) { - irq_handler_t timer_routine = dev_id; - clk_total += jiffy_ticks; clk_offset = 0; - timer_routine(0, NULL); + legacy_timer_tick(1); timer_heartbeat(); return IRQ_HANDLED; @@ -504,7 +502,7 @@ static void __init amiga_sched_init(irq_handler_t timer_routine) * SCSI code. We'll have to take a look at this later */ if (request_irq(IRQ_AMIGA_CIAB_TA, ciab_timer_handler, IRQF_TIMER, - "timer", timer_routine)) + "timer", NULL)) pr_err("Couldn't register timer interrupt\n"); /* start timer */ ciab.cra |= 0x11; |