sh: Kill off mv_heartbeat() from the machvec.

Nothing is using this any more, so get rid of it before anyone gets the
bright idea to start using it again.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h
index f1bae02ef7b6398c8620a83427a51ef368c0df1d..e14e09b3d6d744b58d4be32fbd20a3530975ab42 100644 (file)
--- a/arch/sh/include/asm/machvec.h
+++ b/arch/sh/include/asm/machvec.h
@@ -47,8 +47,6 @@ struct sh_machine_vector {
        void (*mv_init_irq)(void);
        void (*mv_init_pci)(void);
 
-       void (*mv_heartbeat)(void);
-
        void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size);
        void (*mv_ioport_unmap)(void __iomem *);
 };

diff --git a/arch/sh/kernel/time_32.c b/arch/sh/kernel/time_32.c
index 1336f275326c70d70b3cf31e0a5c3e531ef59750..8457f83242c536a35cc47fb6086a64e01bdb0a80 100644 (file)
--- a/arch/sh/kernel/time_32.c
+++ b/arch/sh/kernel/time_32.c
@@ -125,11 +125,6 @@ void handle_timer_tick(void)
        if (current->pid)
                profile_tick(CPU_PROFILING);
 
-#ifdef CONFIG_HEARTBEAT
-       if (sh_mv.mv_heartbeat != NULL)
-               sh_mv.mv_heartbeat();
-#endif
-
        /*
         * Here we are in the timer irq handler. We just have irqs locally
         * disabled but we don't know if the timer_bh is running on the other

diff --git a/arch/sh/kernel/time_64.c b/arch/sh/kernel/time_64.c
index bbb2af1004d9eb2639598c1eef87b8954e147ef8..59d2a03e8b3c475763ff1d228e6177454f27fe1d 100644 (file)
--- a/arch/sh/kernel/time_64.c
+++ b/arch/sh/kernel/time_64.c
@@ -240,11 +240,6 @@ static inline void do_timer_interrupt(void)
 
        do_timer(1);
 
-#ifdef CONFIG_HEARTBEAT
-       if (sh_mv.mv_heartbeat != NULL)
-               sh_mv.mv_heartbeat();
-#endif
-
        /*
         * If we have an externally synchronized Linux clock, then update
         * RTC clock accordingly every ~11 minutes. Set_rtc_mmss() has to be