[PATCH 40/44] x86: intel-mid: Drop registration of dummy poweroff handlers
From: linux@roeck-us.net (Guenter Roeck)
Date: 2014-10-07 05:36:23
Also in:
linux-acpi, linux-alpha, linux-devicetree, linux-efi, linux-mips, linux-pm, linux-s390, linux-sh, linux-tegra, linux-um, linuxppc-dev, lkml
Subsystem:
intel mid (mobile internet device) platform, the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
Andy Shevchenko, Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
A dummy poweroff handler does not serve any purpose. Drop it. Cc: Thomas Gleixner <redacted> Cc: Ingo Molnar <mingo@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- arch/x86/platform/intel-mid/intel-mid.c | 5 ----- arch/x86/platform/intel-mid/mfld.c | 5 ----- 2 files changed, 10 deletions(-)
diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
index 1bbedc4..4b70666 100644
--- a/arch/x86/platform/intel-mid/intel-mid.c
+++ b/arch/x86/platform/intel-mid/intel-mid.c@@ -67,10 +67,6 @@ static void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT; enum intel_mid_cpu_type __intel_mid_cpu_chip; EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip); -static void intel_mid_power_off(void) -{ -}; - static void intel_mid_reboot(void) { intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
@@ -183,7 +179,6 @@ void __init x86_intel_mid_early_setup(void) legacy_pic = &null_legacy_pic; - pm_power_off = intel_mid_power_off; machine_ops.emergency_restart = intel_mid_reboot; /* Avoid searching for BIOS MP tables */
diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
index 23381d2..cf6842f 100644
--- a/arch/x86/platform/intel-mid/mfld.c
+++ b/arch/x86/platform/intel-mid/mfld.c@@ -23,10 +23,6 @@ static struct intel_mid_ops penwell_ops = { .arch_setup = penwell_arch_setup, }; -static void mfld_power_off(void) -{ -} - static unsigned long __init mfld_calibrate_tsc(void) { unsigned long fast_calibrate;
@@ -61,7 +57,6 @@ static unsigned long __init mfld_calibrate_tsc(void) static void __init penwell_arch_setup(void) { x86_platform.calibrate_tsc = mfld_calibrate_tsc; - pm_power_off = mfld_power_off; } void *get_penwell_ops(void)
--
1.9.1