summaryrefslogtreecommitdiffstats
path: root/arch/m68k/68000
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2020-09-24 17:06:38 +0200
committerArnd Bergmann <arnd@arndb.de>2020-10-30 21:57:06 +0100
commit09323308f63708d60aea9d5b9552ce759ef278dc (patch)
tree2442f9116dc971e30e6db837402008df68e6acea /arch/m68k/68000
parentm68k: sun3/sun3c: use legacy_timer_tick (diff)
downloadlinux-09323308f63708d60aea9d5b9552ce759ef278dc.tar.xz
linux-09323308f63708d60aea9d5b9552ce759ef278dc.zip
m68k: m68328: use legacy_timer_tick()
A couple of machines share the m68328 timer code that is based on calling timer_interrupt(). Change these to the new and slightly more generic legacy_timer_tick() helper. Reviewed-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/68000')
-rw-r--r--arch/m68k/68000/timers.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/m68k/68000/timers.c b/arch/m68k/68000/timers.c
index e8dfdd2556a5..3aa006f8e7ea 100644
--- a/arch/m68k/68000/timers.c
+++ b/arch/m68k/68000/timers.c
@@ -52,7 +52,6 @@
#endif
static u32 m68328_tick_cnt;
-static irq_handler_t timer_interrupt;
/***************************************************************************/
@@ -62,7 +61,8 @@ static irqreturn_t hw_tick(int irq, void *dummy)
TSTAT &= 0;
m68328_tick_cnt += TICKS_PER_JIFFY;
- return timer_interrupt(irq, dummy);
+ legacy_timer_tick(1);
+ return IRQ_HANDLED;
}
/***************************************************************************/
@@ -113,7 +113,6 @@ void hw_timer_init(irq_handler_t handler)
/* Enable timer 1 */
TCTL |= TCTL_TEN;
clocksource_register_hz(&m68328_clk, TICKS_PER_JIFFY*HZ);
- timer_interrupt = handler;
}
/***************************************************************************/