diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2021-02-11 15:40:05 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-02-15 20:10:30 +0100 |
| commit | 6517da7aac9df9d5dda4e1e6989db429a8f32de7 (patch) | |
| tree | 7838ed7aec98b6c85f177eb64a947e93767e884d /arch | |
| parent | 24c92537ccacb6aded2ba7a02144ddb2e9cf0d62 (diff) | |
| download | linux-stable-6517da7aac9df9d5dda4e1e6989db429a8f32de7.tar.gz linux-stable-6517da7aac9df9d5dda4e1e6989db429a8f32de7.tar.bz2 linux-stable-6517da7aac9df9d5dda4e1e6989db429a8f32de7.zip | |
x86/platform/intel-mid: Get rid of intel_scu_ipc_legacy.h
The header is used by a single user. Move header content to that user.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/intel_scu_ipc.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/intel_scu_ipc_legacy.h | 18 | ||||
| -rw-r--r-- | arch/x86/platform/intel-mid/intel-mid.c | 7 |
3 files changed, 5 insertions, 22 deletions
diff --git a/arch/x86/include/asm/intel_scu_ipc.h b/arch/x86/include/asm/intel_scu_ipc.h index 11d457af68c5..8537f597d20a 100644 --- a/arch/x86/include/asm/intel_scu_ipc.h +++ b/arch/x86/include/asm/intel_scu_ipc.h @@ -65,6 +65,4 @@ static inline int intel_scu_ipc_dev_command(struct intel_scu_ipc_dev *scu, int c inlen, out, outlen); } -#include <asm/intel_scu_ipc_legacy.h> - #endif diff --git a/arch/x86/include/asm/intel_scu_ipc_legacy.h b/arch/x86/include/asm/intel_scu_ipc_legacy.h deleted file mode 100644 index fa529e5ec142..000000000000 --- a/arch/x86/include/asm/intel_scu_ipc_legacy.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_X86_INTEL_SCU_IPC_LEGACY_H_ -#define _ASM_X86_INTEL_SCU_IPC_LEGACY_H_ - -#include <linux/types.h> - -#define IPCMSG_COLD_OFF 0x80 /* Only for Tangier */ -#define IPCMSG_COLD_RESET 0xF1 - -/* Don't call these in new code - they will be removed eventually */ - -/* Issue commands to the SCU with or without data */ -static inline int intel_scu_ipc_simple_command(int cmd, int sub) -{ - return intel_scu_ipc_dev_simple_command(NULL, cmd, sub); -} - -#endif diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c index 2c044e260b4b..846b2ded39d9 100644 --- a/arch/x86/platform/intel-mid/intel-mid.c +++ b/arch/x86/platform/intel-mid/intel-mid.c @@ -29,6 +29,9 @@ #include <asm/intel_scu_ipc.h> #include <asm/reboot.h> +#define IPCMSG_COLD_OFF 0x80 /* Only for Tangier */ +#define IPCMSG_COLD_RESET 0xF1 + enum intel_mid_cpu_type __intel_mid_cpu_chip; EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip); @@ -38,12 +41,12 @@ static void intel_mid_power_off(void) intel_mid_pwr_power_off(); /* Only for Tangier, the rest will ignore this command */ - intel_scu_ipc_simple_command(IPCMSG_COLD_OFF, 1); + intel_scu_ipc_dev_simple_command(NULL, IPCMSG_COLD_OFF, 1); }; static void intel_mid_reboot(void) { - intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 0); + intel_scu_ipc_dev_simple_command(NULL, IPCMSG_COLD_RESET, 0); } static void __init intel_mid_time_init(void) |