aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 6983272f9d02..a8080dfe7183 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -420,6 +420,8 @@ acpi_status acpi_add_pm_notifier(struct acpi_device *adev,
420 acpi_notify_handler handler, void *context); 420 acpi_notify_handler handler, void *context);
421acpi_status acpi_remove_pm_notifier(struct acpi_device *adev, 421acpi_status acpi_remove_pm_notifier(struct acpi_device *adev,
422 acpi_notify_handler handler); 422 acpi_notify_handler handler);
423int acpi_device_power_state(struct device *dev, struct acpi_device *adev,
424 u32 target_state, int d_max_in, int *d_min_p);
423int acpi_pm_device_sleep_state(struct device *, int *, int); 425int acpi_pm_device_sleep_state(struct device *, int *, int);
424#else 426#else
425static inline acpi_status acpi_add_pm_notifier(struct acpi_device *adev, 427static inline acpi_status acpi_add_pm_notifier(struct acpi_device *adev,
@@ -433,12 +435,23 @@ static inline acpi_status acpi_remove_pm_notifier(struct acpi_device *adev,
433{ 435{
434 return AE_SUPPORT; 436 return AE_SUPPORT;
435} 437}
436static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m) 438static inline int __acpi_device_power_state(int m, int *p)
437{ 439{
438 if (p) 440 if (p)
439 *p = ACPI_STATE_D0; 441 *p = ACPI_STATE_D0;
440 return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3) ? m : ACPI_STATE_D0; 442 return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3) ? m : ACPI_STATE_D0;
441} 443}
444static inline int acpi_device_power_state(struct device *dev,
445 struct acpi_device *adev,
446 u32 target_state, int d_max_in,
447 int *d_min_p)
448{
449 return __acpi_device_power_state(d_max_in, d_min_p);
450}
451static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m)
452{
453 return __acpi_device_power_state(m, p);
454}
442#endif 455#endif
443 456
444#ifdef CONFIG_PM_RUNTIME 457#ifdef CONFIG_PM_RUNTIME