5 files changed, 43 insertions, 30 deletions

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 5667c2f02c51..cc5e28c8885c 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -295,6 +295,12 @@ int class_for_each_device(struct class *class, struct device *start,
 
         if (!class)
                 return -EINVAL;
+        if (!class->p) {
+                WARN(1, "%s called for class '%s' before it was initialized",
+                     __func__, class->name);
+                return -EINVAL;
+        }
+
         mutex_lock(&class->p->class_mutex);
         list_for_each_entry(dev, &class->p->class_devices, node) {
                 if (start) {
@@ -344,6 +350,11 @@ struct device *class_find_device(struct class *class, struct device *start,
 
         if (!class)
                 return NULL;
+        if (!class->p) {
+                WARN(1, "%s called for class '%s' before it was initialized",
+                     __func__, class->name);
+                return NULL;
+        }
 
         mutex_lock(&class->p->class_mutex);
         list_for_each_entry(dev, &class->p->class_devices, node) {
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 068aa1c9538c..d021c98605b3 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -53,7 +53,7 @@ static inline int device_is_not_partition(struct device *dev)
  * it is attached to.  If it is not attached to a bus either, an empty
  * string will be returned.
  */
-const char *dev_driver_string(struct device *dev)
+const char *dev_driver_string(const struct device *dev)
 {
         return dev->driver ? dev->driver->name :
                         (dev->bus ? dev->bus->name :
@@ -541,6 +541,7 @@ void device_initialize(struct device *dev)
         spin_lock_init(&dev->devres_lock);
         INIT_LIST_HEAD(&dev->devres_head);
         device_init_wakeup(dev, 0);
+        device_pm_init(dev);
         set_dev_node(dev, -1);
 }
 
@@ -843,13 +844,19 @@ int device_add(struct device *dev)
 {
         struct device *parent = NULL;
         struct class_interface *class_intf;
-        int error;
+        int error = -EINVAL;
 
         dev = get_device(dev);
-        if (!dev || !strlen(dev->bus_id)) {
-                error = -EINVAL;
-                goto Done;
-        }
+        if (!dev)
+                goto done;
+
+        /* Temporarily support init_name if it is set.
+         * It will override bus_id for now */
+        if (dev->init_name)
+                dev_set_name(dev, "%s", dev->init_name);
+
+        if (!strlen(dev->bus_id))
+                goto done;
 
         pr_debug("device: '%s': %s\n", dev->bus_id, __func__);
 
@@ -897,9 +904,10 @@ int device_add(struct device *dev)
         error = bus_add_device(dev);
         if (error)
                 goto BusError;
-        error = device_pm_add(dev);
+        error = dpm_sysfs_add(dev);
         if (error)
-                goto PMError;
+                goto DPMError;
+        device_pm_add(dev);
         kobject_uevent(&dev->kobj, KOBJ_ADD);
         bus_attach_device(dev);
         if (parent)
@@ -917,10 +925,10 @@ int device_add(struct device *dev)
                                 class_intf->add_dev(dev, class_intf);
                 mutex_unlock(&dev->class->p->class_mutex);
         }
- Done:
+done:
         put_device(dev);
         return error;
- PMError:
+ DPMError:
         bus_remove_device(dev);
  BusError:
         if (dev->bus)
@@ -944,7 +952,7 @@ int device_add(struct device *dev)
         cleanup_device_parent(dev);
         if (parent)
                 put_device(parent);
-        goto Done;
+        goto done;
 }
 
 /**
@@ -1007,6 +1015,7 @@ void device_del(struct device *dev)
         struct class_interface *class_intf;
 
         device_pm_remove(dev);
+        dpm_sysfs_remove(dev);
         if (parent)
                 klist_del(&dev->knode_parent);
         if (MAJOR(dev->devt)) {
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 2ef5acf4368b..1e2bda780e48 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -16,9 +16,6 @@
 #include <linux/string.h>
 #include "base.h"
 
-#define to_dev(node) container_of(node, struct device, driver_list)
-
-
 static struct device *next_device(struct klist_iter *i)
 {
         struct klist_node *n = klist_next(i);
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 3250c5257b74..273a944d4040 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -67,20 +67,16 @@ void device_pm_unlock(void)
  *      device_pm_add - add a device to the list of active devices
  *      @dev:   Device to be added to the list
  */
-int device_pm_add(struct device *dev)
+void 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));
         mutex_lock(&dpm_list_mtx);
         if (dev->parent) {
-                if (dev->parent->power.status >= DPM_SUSPENDING) {
-                        dev_warn(dev, "parent %s is sleeping, will not add\n",
+                if (dev->parent->power.status >= DPM_SUSPENDING)
+                        dev_warn(dev, "parent %s should not be sleeping\n",
                                 dev->parent->bus_id);
-                        WARN_ON(true);
-                }
         } else if (transition_started) {
                 /*
                  * We refuse to register parentless devices while a PM
@@ -89,13 +85,9 @@ int device_pm_add(struct device *dev)
                  */
                 WARN_ON(true);
         }
-        error = dpm_sysfs_add(dev);
-        if (!error) {
-                dev->power.status = DPM_ON;
-                list_add_tail(&dev->power.entry, &dpm_list);
-        }
+
+        list_add_tail(&dev->power.entry, &dpm_list);
         mutex_unlock(&dpm_list_mtx);
-        return error;
 }
 
 /**
@@ -110,7 +102,6 @@ void device_pm_remove(struct device *dev)
                  dev->bus ? dev->bus->name : "No Bus",
                  kobject_name(&dev->kobj));
         mutex_lock(&dpm_list_mtx);
-        dpm_sysfs_remove(dev);
         list_del_init(&dev->power.entry);
         mutex_unlock(&dpm_list_mtx);
 }
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index a3252c0e2887..41f51fae042f 100644
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -1,3 +1,8 @@
+static inline void device_pm_init(struct device *dev)
+{
+        dev->power.status = DPM_ON;
+}
+
 #ifdef CONFIG_PM_SLEEP
 
 /*
@@ -11,12 +16,12 @@ static inline struct device *to_device(struct list_head *entry)
         return container_of(entry, struct device, power.entry);
 }
 
-extern int device_pm_add(struct device *);
+extern void device_pm_add(struct device *);
 extern void device_pm_remove(struct device *);
 
 #else /* CONFIG_PM_SLEEP */
 
-static inline int device_pm_add(struct device *dev) { return 0; }
+static inline void device_pm_add(struct device *dev) {}
 static inline void device_pm_remove(struct device *dev) {}
 
 #endif