1 files changed, 12 insertions, 32 deletions

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 05dc8764e765..eb9f38d0aa58 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -20,64 +20,44 @@
  */
 
 #include <linux/device.h>
+#include <linux/mutex.h>
+
 #include "power.h"
 
 LIST_HEAD(dpm_active);
 LIST_HEAD(dpm_off);
 LIST_HEAD(dpm_off_irq);
 
-DECLARE_MUTEX(dpm_sem);
-DECLARE_MUTEX(dpm_list_sem);
+DEFINE_MUTEX(dpm_mtx);
+DEFINE_MUTEX(dpm_list_mtx);
 
 int (*platform_enable_wakeup)(struct device *dev, int is_on);
 
-
-/**
- *      device_pm_set_parent - Specify power dependency.
- *      @dev:           Device who needs power.
- *      @parent:        Device that supplies power.
- *
- *      This function is used to manually describe a power-dependency
- *      relationship. It may be used to specify a transversal relationship
- *      (where the power supplier is not the physical (or electrical)
- *      ancestor of a specific device.
- *      The effect of this is that the supplier will not be powered down
- *      before the power dependent.
- */
-
-void device_pm_set_parent(struct device * dev, struct device * parent)
-{
-        put_device(dev->power.pm_parent);
-        dev->power.pm_parent = get_device(parent);
-}
-EXPORT_SYMBOL_GPL(device_pm_set_parent);
-
-int device_pm_add(struct device * dev)
+int device_pm_add(struct device *dev)
 {
         int error;
 
         pr_debug("PM: Adding info for %s:%s\n",
                  dev->bus ? dev->bus->name : "No Bus",
                  kobject_name(&dev->kobj));
-        down(&dpm_list_sem);
+        mutex_lock(&dpm_list_mtx);
         list_add_tail(&dev->power.entry, &dpm_active);
-        device_pm_set_parent(dev, dev->parent);
-        if ((error = dpm_sysfs_add(dev)))
+        error = dpm_sysfs_add(dev);
+        if (error)
                 list_del(&dev->power.entry);
-        up(&dpm_list_sem);
+        mutex_unlock(&dpm_list_mtx);
         return error;
 }
 
-void device_pm_remove(struct device * dev)
+void device_pm_remove(struct device *dev)
 {
         pr_debug("PM: Removing info for %s:%s\n",
                  dev->bus ? dev->bus->name : "No Bus",
                  kobject_name(&dev->kobj));
-        down(&dpm_list_sem);
+        mutex_lock(&dpm_list_mtx);
         dpm_sysfs_remove(dev);
-        put_device(dev->power.pm_parent);
         list_del_init(&dev->power.entry);
-        up(&dpm_list_sem);
+        mutex_unlock(&dpm_list_mtx);
 }