Merge branch 'core/stacktrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[linux-2.6] / drivers / base / power / main.c

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index c4568b82875b9fb6379f3c650175143c2ebc6e81..45cc3d9eacb874db52f663fe4cc3dea83b41d92c 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -62,7 +62,7 @@ static bool all_sleeping;
  */
 int device_pm_add(struct device *dev)
 {
-       int error = 0;
+       int error;
 
        pr_debug("PM: Adding info for %s:%s\n",
                 dev->bus ? dev->bus->name : "No Bus",
@@ -70,18 +70,15 @@ int device_pm_add(struct device *dev)
        mutex_lock(&dpm_list_mtx);
        if ((dev->parent && dev->parent->power.sleeping) || all_sleeping) {
                if (dev->parent->power.sleeping)
-                       dev_warn(dev,
-                               "parent %s is sleeping, will not add\n",
+                       dev_warn(dev, "parent %s is sleeping\n",
                                dev->parent->bus_id);
                else
-                       dev_warn(dev, "devices are sleeping, will not add\n");
+                       dev_warn(dev, "all devices are sleeping\n");
                WARN_ON(true);
-               error = -EBUSY;
-       } else {
-               error = dpm_sysfs_add(dev);
-               if (!error)
-                       list_add_tail(&dev->power.entry, &dpm_active);
        }
+       error = dpm_sysfs_add(dev);
+       if (!error)
+               list_add_tail(&dev->power.entry, &dpm_active);
        mutex_unlock(&dpm_list_mtx);
        return error;
 }
@@ -421,7 +418,7 @@ void __suspend_report_result(const char *function, void *fn, int ret)
 {
        if (ret) {
                printk(KERN_ERR "%s(): ", function);
-               print_fn_descriptor_symbol("%s() returns ", (unsigned long)fn);
+               print_fn_descriptor_symbol("%s returns ", fn);
                printk("%d\n", ret);
        }
 }