2 files changed, 34 insertions, 37 deletions

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index eec5ed5be949..bea6896be122 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -1041,6 +1041,40 @@ static struct dev_pm_domain acpi_general_pm_domain = {
 };
 
 /**
+ * acpi_dev_pm_detach - Remove ACPI power management from the device.
+ * @dev: Device to take care of.
+ * @power_off: Whether or not to try to remove power from the device.
+ *
+ * Remove the device from the general ACPI PM domain and remove its wakeup
+ * notifier.  If @power_off is set, additionally remove power from the device if
+ * possible.
+ *
+ * Callers must ensure proper synchronization of this function with power
+ * management callbacks.
+ */
+static void acpi_dev_pm_detach(struct device *dev, bool power_off)
+{
+        struct acpi_device *adev = ACPI_COMPANION(dev);
+
+        if (adev && dev->pm_domain == &acpi_general_pm_domain) {
+                dev->pm_domain = NULL;
+                acpi_remove_pm_notifier(adev);
+                if (power_off) {
+                        /*
+                         * If the device's PM QoS resume latency limit or flags
+                         * have been exposed to user space, they have to be
+                         * hidden at this point, so that they don't affect the
+                         * choice of the low-power state to put the device into.
+                         */
+                        dev_pm_qos_hide_latency_limit(dev);
+                        dev_pm_qos_hide_flags(dev);
+                        acpi_device_wakeup(adev, ACPI_STATE_S0, false);
+                        acpi_dev_pm_low_power(dev, adev, ACPI_STATE_S0);
+                }
+        }
+}
+
+/**
  * acpi_dev_pm_attach - Prepare device for ACPI power management.
  * @dev: Device to prepare.
  * @power_on: Whether or not to power on the device.
@@ -1077,39 +1111,4 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
         return 0;
 }
 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
-
-/**
- * acpi_dev_pm_detach - Remove ACPI power management from the device.
- * @dev: Device to take care of.
- * @power_off: Whether or not to try to remove power from the device.
- *
- * Remove the device from the general ACPI PM domain and remove its wakeup
- * notifier.  If @power_off is set, additionally remove power from the device if
- * possible.
- *
- * Callers must ensure proper synchronization of this function with power
- * management callbacks.
- */
-void acpi_dev_pm_detach(struct device *dev, bool power_off)
-{
-        struct acpi_device *adev = ACPI_COMPANION(dev);
-
-        if (adev && dev->pm_domain == &acpi_general_pm_domain) {
-                dev->pm_domain = NULL;
-                acpi_remove_pm_notifier(adev);
-                if (power_off) {
-                        /*
-                         * If the device's PM QoS resume latency limit or flags
-                         * have been exposed to user space, they have to be
-                         * hidden at this point, so that they don't affect the
-                         * choice of the low-power state to put the device into.
-                         */
-                        dev_pm_qos_hide_latency_limit(dev);
-                        dev_pm_qos_hide_flags(dev);
-                        acpi_device_wakeup(adev, ACPI_STATE_S0, false);
-                        acpi_dev_pm_low_power(dev, adev, ACPI_STATE_S0);
-                }
-        }
-}
-EXPORT_SYMBOL_GPL(acpi_dev_pm_detach);
 #endif /* CONFIG_PM */
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 807cbc46d73e..b7926bb9b444 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -587,7 +587,6 @@ static inline int acpi_subsys_freeze(struct device *dev) { return 0; }
 #if defined(CONFIG_ACPI) && defined(CONFIG_PM)
 struct acpi_device *acpi_dev_pm_get_node(struct device *dev);
 int acpi_dev_pm_attach(struct device *dev, bool power_on);
-void acpi_dev_pm_detach(struct device *dev, bool power_off);
 #else
 static inline struct acpi_device *acpi_dev_pm_get_node(struct device *dev)
 {
@@ -597,7 +596,6 @@ static inline int acpi_dev_pm_attach(struct device *dev, bool power_on)
 {
         return -ENODEV;
 }
-static inline void acpi_dev_pm_detach(struct device *dev, bool power_off) {}
 #endif
 
 #ifdef CONFIG_ACPI