diff options
| -rw-r--r-- | drivers/acpi/device_pm.c | 5 | ||||
| -rw-r--r-- | include/linux/acpi.h | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index 9e5fd9c440b7..49a51277f81d 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c | |||
| @@ -928,7 +928,7 @@ EXPORT_SYMBOL_GPL(acpi_subsys_prepare); | |||
| 928 | * acpi_subsys_complete - Finalize device's resume during system resume. | 928 | * acpi_subsys_complete - Finalize device's resume during system resume. |
| 929 | * @dev: Device to handle. | 929 | * @dev: Device to handle. |
| 930 | */ | 930 | */ |
| 931 | static void acpi_subsys_complete(struct device *dev) | 931 | void acpi_subsys_complete(struct device *dev) |
| 932 | { | 932 | { |
| 933 | /* | 933 | /* |
| 934 | * If the device had been runtime-suspended before the system went into | 934 | * If the device had been runtime-suspended before the system went into |
| @@ -938,6 +938,7 @@ static void acpi_subsys_complete(struct device *dev) | |||
| 938 | if (dev->power.direct_complete) | 938 | if (dev->power.direct_complete) |
| 939 | pm_request_resume(dev); | 939 | pm_request_resume(dev); |
| 940 | } | 940 | } |
| 941 | EXPORT_SYMBOL_GPL(acpi_subsys_complete); | ||
| 941 | 942 | ||
| 942 | /** | 943 | /** |
| 943 | * acpi_subsys_suspend - Run the device driver's suspend callback. | 944 | * acpi_subsys_suspend - Run the device driver's suspend callback. |
| @@ -951,6 +952,7 @@ int acpi_subsys_suspend(struct device *dev) | |||
| 951 | pm_runtime_resume(dev); | 952 | pm_runtime_resume(dev); |
| 952 | return pm_generic_suspend(dev); | 953 | return pm_generic_suspend(dev); |
| 953 | } | 954 | } |
| 955 | EXPORT_SYMBOL_GPL(acpi_subsys_suspend); | ||
| 954 | 956 | ||
| 955 | /** | 957 | /** |
| 956 | * acpi_subsys_suspend_late - Suspend device using ACPI. | 958 | * acpi_subsys_suspend_late - Suspend device using ACPI. |
| @@ -996,6 +998,7 @@ int acpi_subsys_freeze(struct device *dev) | |||
| 996 | pm_runtime_resume(dev); | 998 | pm_runtime_resume(dev); |
| 997 | return pm_generic_freeze(dev); | 999 | return pm_generic_freeze(dev); |
| 998 | } | 1000 | } |
| 1001 | EXPORT_SYMBOL_GPL(acpi_subsys_freeze); | ||
| 999 | 1002 | ||
| 1000 | #endif /* CONFIG_PM_SLEEP */ | 1003 | #endif /* CONFIG_PM_SLEEP */ |
| 1001 | 1004 | ||
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 7a8f2cd66c8b..4c007262e891 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -554,14 +554,20 @@ static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; } | |||
| 554 | int acpi_dev_suspend_late(struct device *dev); | 554 | int acpi_dev_suspend_late(struct device *dev); |
| 555 | int acpi_dev_resume_early(struct device *dev); | 555 | int acpi_dev_resume_early(struct device *dev); |
| 556 | int acpi_subsys_prepare(struct device *dev); | 556 | int acpi_subsys_prepare(struct device *dev); |
| 557 | void acpi_subsys_complete(struct device *dev); | ||
| 557 | int acpi_subsys_suspend_late(struct device *dev); | 558 | int acpi_subsys_suspend_late(struct device *dev); |
| 558 | int acpi_subsys_resume_early(struct device *dev); | 559 | int acpi_subsys_resume_early(struct device *dev); |
| 560 | int acpi_subsys_suspend(struct device *dev); | ||
| 561 | int acpi_subsys_freeze(struct device *dev); | ||
| 559 | #else | 562 | #else |
| 560 | static inline int acpi_dev_suspend_late(struct device *dev) { return 0; } | 563 | static inline int acpi_dev_suspend_late(struct device *dev) { return 0; } |
| 561 | static inline int acpi_dev_resume_early(struct device *dev) { return 0; } | 564 | static inline int acpi_dev_resume_early(struct device *dev) { return 0; } |
| 562 | static inline int acpi_subsys_prepare(struct device *dev) { return 0; } | 565 | static inline int acpi_subsys_prepare(struct device *dev) { return 0; } |
| 566 | static inline void acpi_subsys_complete(struct device *dev) {} | ||
| 563 | static inline int acpi_subsys_suspend_late(struct device *dev) { return 0; } | 567 | static inline int acpi_subsys_suspend_late(struct device *dev) { return 0; } |
| 564 | static inline int acpi_subsys_resume_early(struct device *dev) { return 0; } | 568 | static inline int acpi_subsys_resume_early(struct device *dev) { return 0; } |
| 569 | static inline int acpi_subsys_suspend(struct device *dev) { return 0; } | ||
| 570 | static inline int acpi_subsys_freeze(struct device *dev) { return 0; } | ||
| 565 | #endif | 571 | #endif |
| 566 | 572 | ||
| 567 | #if defined(CONFIG_ACPI) && defined(CONFIG_PM) | 573 | #if defined(CONFIG_ACPI) && defined(CONFIG_PM) |
