diff options
| author | Rafael J. Wysocki | 2014-11-27 22:38:23 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2014-12-04 00:50:19 +0100 |
| commit | 5de21bb998b8e816e6a1df1f2c04d95fb6e27a5d (patch) | |
| tree | 836c77264fd2f659d6c32572b8c5ae4629152c84 /include/acpi/acpi_bus.h | |
| parent | Merge branch 'acpi-lpss' into pm-runtime (diff) | |
| download | kernel-qcow2-linux-5de21bb998b8e816e6a1df1f2c04d95fb6e27a5d.tar.gz kernel-qcow2-linux-5de21bb998b8e816e6a1df1f2c04d95fb6e27a5d.tar.xz kernel-qcow2-linux-5de21bb998b8e816e6a1df1f2c04d95fb6e27a5d.zip | |
ACPI / PM: Drop CONFIG_PM_RUNTIME from the ACPI core
After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so quite a few
depend on CONFIG_PM.
Replace CONFIG_PM_RUNTIME with CONFIG_PM in the ACPI core code.
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi/acpi_bus.h')
| -rw-r--r-- | include/acpi/acpi_bus.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index f34a0835aa4f..78f7521417e3 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -516,6 +516,7 @@ acpi_status acpi_add_pm_notifier(struct acpi_device *adev, struct device *dev, void (*work_func)(struct work_struct *work)); acpi_status acpi_remove_pm_notifier(struct acpi_device *adev); int acpi_pm_device_sleep_state(struct device *, int *, int); +int acpi_pm_device_run_wake(struct device *, bool); #else static inline acpi_status acpi_add_pm_notifier(struct acpi_device *adev, struct device *dev, @@ -535,11 +536,6 @@ static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m) return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3_COLD) ? m : ACPI_STATE_D0; } -#endif - -#ifdef CONFIG_PM_RUNTIME -int acpi_pm_device_run_wake(struct device *, bool); -#else static inline int acpi_pm_device_run_wake(struct device *dev, bool enable) { return -ENODEV; |