Merge tag 'drm-next-2020-12-18' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / arch / m68k / 68000 / timers.c

diff --git a/arch/m68k/68000/timers.c b/arch/m68k/68000/timers.c
index e8dfdd2..0d0417c 100644 (file)
--- 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;
 }
 
 /***************************************************************************/
@@ -91,7 +91,7 @@ static struct clocksource m68328_clk = {
 
 /***************************************************************************/
 
-void hw_timer_init(irq_handler_t handler)
+void hw_timer_init(void)
 {
        int ret;
 
@@ -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;
 }
 
 /***************************************************************************/