aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>2014-05-15 09:40:23 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-05-20 07:23:07 -0400
commit4cf563c5d97c83d4b2fb3a778dd7d5e362cc3e34 (patch)
tree2f4febd682fed0794cb06b515dc3b3b1f632f69d
parentf25c0ae2b4c41996c1a6b609132c1788a6eea080 (diff)
ACPI / PM: Export rest of the subsys PM callbacks
No reason for excluding the remaining ones. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> [rjw: Rebased and exported the new acpi_subsys_complete() too.] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/device_pm.c5
-rw-r--r--include/linux/acpi.h6
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 */
931static void acpi_subsys_complete(struct device *dev) 931void 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}
941EXPORT_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}
955EXPORT_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}
1001EXPORT_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; }
554int acpi_dev_suspend_late(struct device *dev); 554int acpi_dev_suspend_late(struct device *dev);
555int acpi_dev_resume_early(struct device *dev); 555int acpi_dev_resume_early(struct device *dev);
556int acpi_subsys_prepare(struct device *dev); 556int acpi_subsys_prepare(struct device *dev);
557void acpi_subsys_complete(struct device *dev);
557int acpi_subsys_suspend_late(struct device *dev); 558int acpi_subsys_suspend_late(struct device *dev);
558int acpi_subsys_resume_early(struct device *dev); 559int acpi_subsys_resume_early(struct device *dev);
560int acpi_subsys_suspend(struct device *dev);
561int acpi_subsys_freeze(struct device *dev);
559#else 562#else
560static inline int acpi_dev_suspend_late(struct device *dev) { return 0; } 563static inline int acpi_dev_suspend_late(struct device *dev) { return 0; }
561static inline int acpi_dev_resume_early(struct device *dev) { return 0; } 564static inline int acpi_dev_resume_early(struct device *dev) { return 0; }
562static inline int acpi_subsys_prepare(struct device *dev) { return 0; } 565static inline int acpi_subsys_prepare(struct device *dev) { return 0; }
566static inline void acpi_subsys_complete(struct device *dev) {}
563static inline int acpi_subsys_suspend_late(struct device *dev) { return 0; } 567static inline int acpi_subsys_suspend_late(struct device *dev) { return 0; }
564static inline int acpi_subsys_resume_early(struct device *dev) { return 0; } 568static inline int acpi_subsys_resume_early(struct device *dev) { return 0; }
569static inline int acpi_subsys_suspend(struct device *dev) { return 0; }
570static 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)