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/apollo | |
| parent | m68k: m68328: use legacy_timer_tick() (diff) | |
| download | linux-42f1d57f055064ed320d7292b95819dd81dda409.tar.xz linux-42f1d57f055064ed320d7292b95819dd81dda409.zip | |
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/apollo')
| -rw-r--r-- | arch/m68k/apollo/config.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index 30915f1a8760..17d59fa6b25b 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c @@ -168,11 +168,9 @@ void __init config_apollo(void) irqreturn_t dn_timer_int(int irq, void *dev_id) { - irq_handler_t timer_handler = dev_id; - volatile unsigned char x; - timer_handler(irq, dev_id); + legacy_timer_tick(1); timer_heartbeat(); x = *(volatile unsigned char *)(apollo_timer + 3); @@ -199,7 +197,7 @@ void dn_sched_init(irq_handler_t timer_routine) *(volatile unsigned char *)(apollo_timer + 0x3)); #endif - if (request_irq(IRQ_APOLLO, dn_timer_int, 0, "time", timer_routine)) + if (request_irq(IRQ_APOLLO, dn_timer_int, 0, "time", NULL)) pr_err("Couldn't register timer interrupt\n"); } |