diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 17:11:42 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 17:11:42 -0400 |
commit | a392f7d4afb850934851fde5a8e298912650a6b8 (patch) | |
tree | ed9901ba019615f6911c0f9f1a3af180b243bc8f /include/linux/acpi.h | |
parent | f58c41cc0427115e3d750ec090020892acf0fb9c (diff) | |
parent | 4cf563c5d97c83d4b2fb3a778dd7d5e362cc3e34 (diff) |
Merge branch 'acpi-pm'
* acpi-pm:
ACPI / PM: Export rest of the subsys PM callbacks
ACPI / PM: Avoid resuming devices in ACPI PM domain during system suspend
ACPI / PM: Hold ACPI scan lock over the "freeze" sleep state
ACPI / PM: Export acpi_target_system_state() to modules
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r-- | include/linux/acpi.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 0e2569031a6f..2ecdfcf98c0f 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -555,14 +555,20 @@ static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; } | |||
555 | int acpi_dev_suspend_late(struct device *dev); | 555 | int acpi_dev_suspend_late(struct device *dev); |
556 | int acpi_dev_resume_early(struct device *dev); | 556 | int acpi_dev_resume_early(struct device *dev); |
557 | int acpi_subsys_prepare(struct device *dev); | 557 | int acpi_subsys_prepare(struct device *dev); |
558 | void acpi_subsys_complete(struct device *dev); | ||
558 | int acpi_subsys_suspend_late(struct device *dev); | 559 | int acpi_subsys_suspend_late(struct device *dev); |
559 | int acpi_subsys_resume_early(struct device *dev); | 560 | int acpi_subsys_resume_early(struct device *dev); |
561 | int acpi_subsys_suspend(struct device *dev); | ||
562 | int acpi_subsys_freeze(struct device *dev); | ||
560 | #else | 563 | #else |
561 | static inline int acpi_dev_suspend_late(struct device *dev) { return 0; } | 564 | static inline int acpi_dev_suspend_late(struct device *dev) { return 0; } |
562 | static inline int acpi_dev_resume_early(struct device *dev) { return 0; } | 565 | static inline int acpi_dev_resume_early(struct device *dev) { return 0; } |
563 | static inline int acpi_subsys_prepare(struct device *dev) { return 0; } | 566 | static inline int acpi_subsys_prepare(struct device *dev) { return 0; } |
567 | static inline void acpi_subsys_complete(struct device *dev) {} | ||
564 | static inline int acpi_subsys_suspend_late(struct device *dev) { return 0; } | 568 | static inline int acpi_subsys_suspend_late(struct device *dev) { return 0; } |
565 | static inline int acpi_subsys_resume_early(struct device *dev) { return 0; } | 569 | static inline int acpi_subsys_resume_early(struct device *dev) { return 0; } |
570 | static inline int acpi_subsys_suspend(struct device *dev) { return 0; } | ||
571 | static inline int acpi_subsys_freeze(struct device *dev) { return 0; } | ||
566 | #endif | 572 | #endif |
567 | 573 | ||
568 | #if defined(CONFIG_ACPI) && defined(CONFIG_PM) | 574 | #if defined(CONFIG_ACPI) && defined(CONFIG_PM) |