From 42f1d57f055064ed320d7292b95819dd81dda409 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 24 Sep 2020 17:21:00 +0200 Subject: 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 Acked-by: Geert Uytterhoeven Tested-by: Geert Uytterhoeven Reviewed-by: Linus Walleij Signed-off-by: Arnd Bergmann --- arch/m68k/atari/time.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'arch/m68k/atari') diff --git a/arch/m68k/atari/time.c b/arch/m68k/atari/time.c index ce4a5961ca93..36d811ae09ee 100644 --- a/arch/m68k/atari/time.c +++ b/arch/m68k/atari/time.c @@ -41,7 +41,6 @@ static u8 last_timer_count; static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id) { - irq_handler_t timer_routine = dev_id; unsigned long flags; local_irq_save(flags); @@ -49,7 +48,7 @@ static irqreturn_t mfp_timer_c_handler(int irq, void *dev_id) last_timer_count = st_mfp.tim_dt_c; } while (last_timer_count == 1); clk_total += INT_TICKS; - timer_routine(0, NULL); + legacy_timer_tick(1); timer_heartbeat(); local_irq_restore(flags); @@ -65,7 +64,7 @@ atari_sched_init(irq_handler_t timer_routine) st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 15) | 0x60; /* install interrupt service routine for MFP Timer C */ if (request_irq(IRQ_MFP_TIMC, mfp_timer_c_handler, IRQF_TIMER, "timer", - timer_routine)) + NULL)) pr_err("Couldn't register timer interrupt\n"); clocksource_register_hz(&atari_clk, INT_CLK); -- cgit v1.2.3