x86/tsc: Remove unused tsc_pre_init() hook

No more users. Remove it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@suse.de>

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 48d34d28f5a60543bc72471e2a1931fcf13dc04e..10002a46c593f43be5c42b529da73afb4501c47a 100644 (file)
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -83,13 +83,11 @@ struct x86_init_paging {
  * struct x86_init_timers - platform specific timer setup
  * @setup_perpcu_clockev:      set up the per cpu clock event device for the
  *                             boot cpu
- * @tsc_pre_init:              platform function called before TSC init
  * @timer_init:                        initialize the platform timer (default PIT/HPET)
  * @wallclock_init:            init the wallclock device
  */
 struct x86_init_timers {
        void (*setup_percpu_clockev)(void);
-       void (*tsc_pre_init)(void);
        void (*timer_init)(void);
        void (*wallclock_init)(void);
 };

diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index c7c4d9c51e99fe582b71ab1f2e3ca9ffaae2226c..3d743da828d38acff0013600ed582c8b14ef81b3 100644 (file)
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -1185,8 +1185,6 @@ void __init tsc_init(void)
        u64 lpj;
        int cpu;
 
-       x86_init.timers.tsc_pre_init();
-
        if (!cpu_has_tsc) {
                setup_clear_cpu_cap(X86_FEATURE_TSC_DEADLINE_TIMER);
                return;

diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 3839628d962e4f1baad89c124724413d8f17d8b2..dad5fe9633a37e03215892c60386a779745fdb61 100644 (file)
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -68,7 +68,6 @@ struct x86_init_ops x86_init __initdata = {
 
        .timers = {
                .setup_percpu_clockev   = setup_boot_APIC_clock,
-               .tsc_pre_init           = x86_init_noop,
                .timer_init             = hpet_time_init,
                .wallclock_init         = x86_init_noop,
        },