aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 4de84ce3a92..8ef68a16aa0 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -389,21 +389,25 @@ struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle);
389int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state); 389int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state);
390int acpi_disable_wakeup_device_power(struct acpi_device *dev); 390int acpi_disable_wakeup_device_power(struct acpi_device *dev);
391 391
392#ifdef CONFIG_PM_SLEEP 392#ifdef CONFIG_PM_OPS
393int acpi_pm_device_sleep_state(struct device *, int *); 393int acpi_pm_device_sleep_state(struct device *, int *);
394int acpi_pm_device_sleep_wake(struct device *, bool); 394#else
395#else /* !CONFIG_PM_SLEEP */
396static inline int acpi_pm_device_sleep_state(struct device *d, int *p) 395static inline int acpi_pm_device_sleep_state(struct device *d, int *p)
397{ 396{
398 if (p) 397 if (p)
399 *p = ACPI_STATE_D0; 398 *p = ACPI_STATE_D0;
400 return ACPI_STATE_D3; 399 return ACPI_STATE_D3;
401} 400}
401#endif
402
403#ifdef CONFIG_PM_SLEEP
404int acpi_pm_device_sleep_wake(struct device *, bool);
405#else
402static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable) 406static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
403{ 407{
404 return -ENODEV; 408 return -ENODEV;
405} 409}
406#endif /* !CONFIG_PM_SLEEP */ 410#endif
407 411
408#endif /* CONFIG_ACPI */ 412#endif /* CONFIG_ACPI */
409 413