Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/init: Remove i8042_detect() from platform ops

Now that i8042 uses flag in legacy platform data, i8042_detect() is
no longer used and can be removed.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Tested-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Cc: linux-input@vger.kernel.org
Link: http://lkml.kernel.org/r/1481317061-31486-4-git-send-email-dmitry.torokhov@gmail.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

authored by

Dmitry Torokhov and committed by
Thomas Gleixner
32786fdc d79e141c

-17
-2
arch/x86/include/asm/x86_init.h
··· 206 206 * @set_wallclock: set time back to HW clock 207 207 * @is_untracked_pat_range exclude from PAT logic 208 208 * @nmi_init enable NMI on cpus 209 - * @i8042_detect pre-detect if i8042 controller exists 210 209 * @save_sched_clock_state: save state for sched_clock() on suspend 211 210 * @restore_sched_clock_state: restore state for sched_clock() on resume 212 211 * @apic_post_init: adjust apic if neeeded ··· 227 228 bool (*is_untracked_pat_range)(u64 start, u64 end); 228 229 void (*nmi_init)(void); 229 230 unsigned char (*get_nmi_reason)(void); 230 - int (*i8042_detect)(void); 231 231 void (*save_sched_clock_state)(void); 232 232 void (*restore_sched_clock_state)(void); 233 233 void (*apic_post_init)(void);
-2
arch/x86/kernel/x86_init.c
··· 89 89 }; 90 90 91 91 static void default_nmi_init(void) { }; 92 - static int default_i8042_detect(void) { return 1; }; 93 92 94 93 struct x86_platform_ops x86_platform __ro_after_init = { 95 94 .calibrate_cpu = native_calibrate_cpu, ··· 99 100 .is_untracked_pat_range = is_ISA_range, 100 101 .nmi_init = default_nmi_init, 101 102 .get_nmi_reason = default_get_nmi_reason, 102 - .i8042_detect = default_i8042_detect, 103 103 .save_sched_clock_state = tsc_save_sched_clock_state, 104 104 .restore_sched_clock_state = tsc_restore_sched_clock_state, 105 105 };
-6
arch/x86/platform/ce4100/ce4100.c
··· 23 23 #include <asm/io_apic.h> 24 24 #include <asm/emergency-restart.h> 25 25 26 - static int ce4100_i8042_detect(void) 27 - { 28 - return 0; 29 - } 30 - 31 26 /* 32 27 * The CE4100 platform has an internal 8051 Microcontroller which is 33 28 * responsible for signaling to the external Power Management Unit the ··· 140 145 void __init x86_ce4100_early_setup(void) 141 146 { 142 147 x86_init.oem.arch_setup = sdv_arch_setup; 143 - x86_platform.i8042_detect = ce4100_i8042_detect; 144 148 x86_init.resources.probe_roms = x86_init_noop; 145 149 x86_init.mpparse.get_smp_config = x86_init_uint_noop; 146 150 x86_init.mpparse.find_smp_config = x86_init_noop;
-7
arch/x86/platform/intel-mid/intel-mid.c
··· 161 161 regulator_has_full_constraints(); 162 162 } 163 163 164 - /* MID systems don't have i8042 controller */ 165 - static int intel_mid_i8042_detect(void) 166 - { 167 - return 0; 168 - } 169 - 170 164 /* 171 165 * Moorestown does not have external NMI source nor port 0x61 to report 172 166 * NMI status. The possible NMI sources are from pmu as a result of NMI ··· 191 197 x86_cpuinit.setup_percpu_clockev = apbt_setup_secondary_clock; 192 198 193 199 x86_platform.calibrate_tsc = intel_mid_calibrate_tsc; 194 - x86_platform.i8042_detect = intel_mid_i8042_detect; 195 200 x86_init.timers.wallclock_init = intel_mid_rtc_init; 196 201 x86_platform.get_nmi_reason = intel_mid_get_nmi_reason; 197 202