Merge tag 'thermal-v5.11-2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / m68k / apollo / config.c

diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c
index 2ebe5b6..581a5f6 100644 (file)
--- a/arch/m68k/apollo/config.c
+++ b/arch/m68k/apollo/config.c
@@ -26,7 +26,7 @@ u_long cpuctrl_physaddr;
 u_long timer_physaddr;
 u_long apollo_model;
 
-extern void dn_sched_init(irq_handler_t handler);
+extern void dn_sched_init(void);
 extern void dn_init_IRQ(void);
 extern int dn_dummy_hwclk(int, struct rtc_time *);
 extern void dn_dummy_reset(void);
@@ -167,11 +167,10 @@ 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);
        x = *(volatile unsigned char *)(apollo_timer + 5);
@@ -179,7 +178,7 @@ irqreturn_t dn_timer_int(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-void dn_sched_init(irq_handler_t timer_routine)
+void dn_sched_init(void)
 {
        /* program timer 1 */
        *(volatile unsigned char *)(apollo_timer + 3) = 0x01;
@@ -197,7 +196,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");
 }