5 files changed, 126 insertions, 200 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 0455aa78fa13..3599ab2506d2 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -24,6 +24,8 @@
 #include "base.h"
 #include "power/power.h"
 
+extern const char *kobject_actions[];
+
 int (*platform_notify)(struct device * dev) = NULL;
 int (*platform_notify_remove)(struct device * dev) = NULL;
 
@@ -303,10 +305,25 @@ out:
 static ssize_t store_uevent(struct device *dev, struct device_attribute *attr,
                             const char *buf, size_t count)
 {
-        if (memcmp(buf, "add", 3) != 0)
-                dev_err(dev, "uevent: unsupported action-string; this will "
-                        "be ignored in a future kernel version");
+        size_t len = count;
+        enum kobject_action action;
+
+        if (len && buf[len-1] == '\n')
+                len--;
+
+        for (action = 0; action < KOBJ_MAX; action++) {
+                if (strncmp(kobject_actions[action], buf, len) != 0)
+                        continue;
+                if (kobject_actions[action][len] != '\0')
+                        continue;
+                kobject_uevent(&dev->kobj, action);
+                goto out;
+        }
+
+        dev_err(dev, "uevent: unsupported action-string; this will "
+                     "be ignored in a future kernel version\n");
         kobject_uevent(&dev->kobj, KOBJ_ADD);
+out:
         return count;
 }
 
@@ -643,6 +660,82 @@ static int setup_parent(struct device *dev, struct device *parent)
         return 0;
 }
 
+static int device_add_class_symlinks(struct device *dev)
+{
+        int error;
+
+        if (!dev->class)
+                return 0;
+        error = sysfs_create_link(&dev->kobj, &dev->class->subsys.kobj,
+                                  "subsystem");
+        if (error)
+                goto out;
+        /*
+         * If this is not a "fake" compatible device, then create the
+         * symlink from the class to the device.
+         */
+        if (dev->kobj.parent != &dev->class->subsys.kobj) {
+                error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
+                                          dev->bus_id);
+                if (error)
+                        goto out_subsys;
+        }
+        /* only bus-device parents get a "device"-link */
+        if (dev->parent && dev->parent->bus) {
+                error = sysfs_create_link(&dev->kobj, &dev->parent->kobj,
+                                          "device");
+                if (error)
+                        goto out_busid;
+#ifdef CONFIG_SYSFS_DEPRECATED
+                {
+                        char * class_name = make_class_name(dev->class->name,
+                                                                &dev->kobj);
+                        if (class_name)
+                                error = sysfs_create_link(&dev->parent->kobj,
+                                                        &dev->kobj, class_name);
+                        kfree(class_name);
+                        if (error)
+                                goto out_device;
+                }
+#endif
+        }
+        return 0;
+
+#ifdef CONFIG_SYSFS_DEPRECATED
+out_device:
+        if (dev->parent)
+                sysfs_remove_link(&dev->kobj, "device");
+#endif
+out_busid:
+        if (dev->kobj.parent != &dev->class->subsys.kobj)
+                sysfs_remove_link(&dev->class->subsys.kobj, dev->bus_id);
+out_subsys:
+        sysfs_remove_link(&dev->kobj, "subsystem");
+out:
+        return error;
+}
+
+static void device_remove_class_symlinks(struct device *dev)
+{
+        if (!dev->class)
+                return;
+        if (dev->parent) {
+#ifdef CONFIG_SYSFS_DEPRECATED
+                char *class_name;
+
+                class_name = make_class_name(dev->class->name, &dev->kobj);
+                if (class_name) {
+                        sysfs_remove_link(&dev->parent->kobj, class_name);
+                        kfree(class_name);
+                }
+#endif
+                sysfs_remove_link(&dev->kobj, "device");
+        }
+        if (dev->kobj.parent != &dev->class->subsys.kobj)
+                sysfs_remove_link(&dev->class->subsys.kobj, dev->bus_id);
+        sysfs_remove_link(&dev->kobj, "subsystem");
+}
+
 /**
  *      device_add - add device to device hierarchy.
  *      @dev:   device.
@@ -657,7 +750,6 @@ static int setup_parent(struct device *dev, struct device *parent)
 int device_add(struct device *dev)
 {
         struct device *parent = NULL;
-        char *class_name = NULL;
         struct class_interface *class_intf;
         int error = -EINVAL;
 
@@ -697,27 +789,9 @@ int device_add(struct device *dev)
                         goto ueventattrError;
         }
 
-        if (dev->class) {
-                sysfs_create_link(&dev->kobj, &dev->class->subsys.kobj,
-                                  "subsystem");
-                /* If this is not a "fake" compatible device, then create the
-                 * symlink from the class to the device. */
-                if (dev->kobj.parent != &dev->class->subsys.kobj)
-                        sysfs_create_link(&dev->class->subsys.kobj,
-                                          &dev->kobj, dev->bus_id);
-                if (parent) {
-                        sysfs_create_link(&dev->kobj, &dev->parent->kobj,
-                                                        "device");
-#ifdef CONFIG_SYSFS_DEPRECATED
-                        class_name = make_class_name(dev->class->name,
-                                                        &dev->kobj);
-                        if (class_name)
-                                sysfs_create_link(&dev->parent->kobj,
-                                                  &dev->kobj, class_name);
-#endif
-                }
-        }
-
+        error = device_add_class_symlinks(dev);
+        if (error)
+                goto SymlinkError;
         error = device_add_attrs(dev);
         if (error)
                 goto AttrsError;
@@ -744,7 +818,6 @@ int device_add(struct device *dev)
                 up(&dev->class->sem);
         }
  Done:
-        kfree(class_name);
         put_device(dev);
         return error;
  BusError:
@@ -755,6 +828,8 @@ int device_add(struct device *dev)
                                              BUS_NOTIFY_DEL_DEVICE, dev);
         device_remove_attrs(dev);
  AttrsError:
+        device_remove_class_symlinks(dev);
+ SymlinkError:
         if (MAJOR(dev->devt))
                 device_remove_file(dev, &devt_attr);
 
@@ -1139,7 +1214,7 @@ int device_rename(struct device *dev, char *new_name)
 {
         char *old_class_name = NULL;
         char *new_class_name = NULL;
-        char *old_symlink_name = NULL;
+        char *old_device_name = NULL;
         int error;
 
         dev = get_device(dev);
@@ -1153,42 +1228,49 @@ int device_rename(struct device *dev, char *new_name)
                 old_class_name = make_class_name(dev->class->name, &dev->kobj);
 #endif
 
-        if (dev->class) {
-                old_symlink_name = kmalloc(BUS_ID_SIZE, GFP_KERNEL);
-                if (!old_symlink_name) {
-                        error = -ENOMEM;
-                        goto out_free_old_class;
-                }
-                strlcpy(old_symlink_name, dev->bus_id, BUS_ID_SIZE);
+        old_device_name = kmalloc(BUS_ID_SIZE, GFP_KERNEL);
+        if (!old_device_name) {
+                error = -ENOMEM;
+                goto out;
         }
-
+        strlcpy(old_device_name, dev->bus_id, BUS_ID_SIZE);
         strlcpy(dev->bus_id, new_name, BUS_ID_SIZE);
 
         error = kobject_rename(&dev->kobj, new_name);
+        if (error) {
+                strlcpy(dev->bus_id, old_device_name, BUS_ID_SIZE);
+                goto out;
+        }
 
 #ifdef CONFIG_SYSFS_DEPRECATED
         if (old_class_name) {
                 new_class_name = make_class_name(dev->class->name, &dev->kobj);
                 if (new_class_name) {
-                        sysfs_create_link(&dev->parent->kobj, &dev->kobj,
-                                          new_class_name);
+                        error = sysfs_create_link(&dev->parent->kobj,
+                                                  &dev->kobj, new_class_name);
+                        if (error)
+                                goto out;
                         sysfs_remove_link(&dev->parent->kobj, old_class_name);
                 }
         }
 #endif
 
         if (dev->class) {
-                sysfs_remove_link(&dev->class->subsys.kobj,
-                                  old_symlink_name);
-                sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
-                                  dev->bus_id);
+                sysfs_remove_link(&dev->class->subsys.kobj, old_device_name);
+                error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
+                                          dev->bus_id);
+                if (error) {
+                        /* Uh... how to unravel this if restoring can fail? */
+                        dev_err(dev, "%s: sysfs_create_symlink failed (%d)\n",
+                                __FUNCTION__, error);
+                }
         }
+out:
         put_device(dev);
 
         kfree(new_class_name);
-        kfree(old_symlink_name);
- out_free_old_class:
         kfree(old_class_name);
+        kfree(old_device_name);
 
         return error;
 }
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile
index 91f230939c1e..fff178007208 100644
--- a/drivers/base/power/Makefile
+++ b/drivers/base/power/Makefile
@@ -1,5 +1,5 @@
 obj-y                   := shutdown.o
-obj-$(CONFIG_PM)        += main.o suspend.o resume.o runtime.o sysfs.o
+obj-$(CONFIG_PM)        += main.o suspend.o resume.o sysfs.o
 obj-$(CONFIG_PM_TRACE)  += trace.o
 
 ifeq ($(CONFIG_DEBUG_DRIVER),y)
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index 2760f25b3ac5..591a0dd5deee 100644
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -62,11 +62,6 @@ extern int resume_device(struct device *);
  */
 extern int suspend_device(struct device *, pm_message_t);
 
-
-/*
- * runtime.c
- */
-
 #else /* CONFIG_PM */
 
 
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
deleted file mode 100644
index df6174d85866..000000000000
--- a/drivers/base/power/runtime.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * drivers/base/power/runtime.c - Handling dynamic device power management.
- *
- * Copyright (c) 2003 Patrick Mochel
- * Copyright (c) 2003 Open Source Development Lab
- *
- */
-
-#include <linux/device.h>
-#include "power.h"
-
-
-static void runtime_resume(struct device * dev)
-{
-        dev_dbg(dev, "resuming\n");
-        if (!dev->power.power_state.event)
-                return;
-        if (!resume_device(dev))
-                dev->power.power_state = PMSG_ON;
-}
-
-
-/**
- *      dpm_runtime_resume - Power one device back on.
- *      @dev:   Device.
- *
- *      Bring one device back to the on state by first powering it
- *      on, then restoring state. We only operate on devices that aren't
- *      already on.
- *      FIXME: We need to handle devices that are in an unknown state.
- */
-
-void dpm_runtime_resume(struct device * dev)
-{
-        mutex_lock(&dpm_mtx);
-        runtime_resume(dev);
-        mutex_unlock(&dpm_mtx);
-}
-EXPORT_SYMBOL(dpm_runtime_resume);
-
-
-/**
- *      dpm_runtime_suspend - Put one device in low-power state.
- *      @dev:   Device.
- *      @state: State to enter.
- */
-
-int dpm_runtime_suspend(struct device * dev, pm_message_t state)
-{
-        int error = 0;
-
-        mutex_lock(&dpm_mtx);
-        if (dev->power.power_state.event == state.event)
-                goto Done;
-
-        if (dev->power.power_state.event)
-                runtime_resume(dev);
-
-        if (!(error = suspend_device(dev, state)))
-                dev->power.power_state = state;
- Done:
-        mutex_unlock(&dpm_mtx);
-        return error;
-}
-EXPORT_SYMBOL(dpm_runtime_suspend);
-
-
-#if 0
-/**
- *      dpm_set_power_state - Update power_state field.
- *      @dev:   Device.
- *      @state: Power state device is in.
- *
- *      This is an update mechanism for drivers to notify the core
- *      what power state a device is in. Device probing code may not
- *      always be able to tell, but we need accurate information to
- *      work reliably.
- */
-void dpm_set_power_state(struct device * dev, pm_message_t state)
-{
-        mutex_lock(&dpm_mtx);
-        dev->power.power_state = state;
-        mutex_unlock(&dpm_mtx);
-}
-#endif  /*  0  */
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index 2d47517dbe32..f2ed179cd695 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -7,69 +7,6 @@
 #include "power.h"
 
 
-#ifdef  CONFIG_PM_SYSFS_DEPRECATED
-
-/**
- *      state - Control current power state of device
- *
- *      show() returns the current power state of the device. '0' indicates
- *      the device is on. Other values (2) indicate the device is in some low
- *      power state.
- *
- *      store() sets the current power state, which is an integer valued
- *      0, 2, or 3.  Devices with bus.suspend_late(), or bus.resume_early()
- *      methods fail this operation; those methods couldn't be called.
- *      Otherwise,
- *
- *      - If the recorded dev->power.power_state.event matches the
- *        target value, nothing is done.
- *      - If the recorded event code is nonzero, the device is reactivated
- *        by calling bus.resume() and/or class.resume().
- *      - If the target value is nonzero, the device is suspended by
- *        calling class.suspend() and/or bus.suspend() with event code
- *        PM_EVENT_SUSPEND.
- *
- *      This mechanism is DEPRECATED and should only be used for testing.
- */
-
-static ssize_t state_show(struct device * dev, struct device_attribute *attr, char * buf)
-{
-        if (dev->power.power_state.event)
-                return sprintf(buf, "2\n");
-        else
-                return sprintf(buf, "0\n");
-}
-
-static ssize_t state_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t n)
-{
-        pm_message_t state;
-        int error = -EINVAL;
-
-        /* disallow incomplete suspend sequences */
-        if (dev->bus && (dev->bus->suspend_late || dev->bus->resume_early))
-                return error;
-
-        state.event = PM_EVENT_SUSPEND;
-        /* Older apps expected to write "3" here - confused with PCI D3 */
-        if ((n == 1) && !strcmp(buf, "3"))
-                error = dpm_runtime_suspend(dev, state);
-
-        if ((n == 1) && !strcmp(buf, "2"))
-                error = dpm_runtime_suspend(dev, state);
-
-        if ((n == 1) && !strcmp(buf, "0")) {
-                dpm_runtime_resume(dev);
-                error = 0;
-        }
-
-        return error ? error : n;
-}
-
-static DEVICE_ATTR(state, 0644, state_show, state_store);
-
-
-#endif  /* CONFIG_PM_SYSFS_DEPRECATED */
-
 /*
  *      wakeup - Report/change current wakeup option for device
  *
@@ -143,9 +80,6 @@ static DEVICE_ATTR(wakeup, 0644, wake_show, wake_store);
 
 
 static struct attribute * power_attrs[] = {
-#ifdef  CONFIG_PM_SYSFS_DEPRECATED
-        &dev_attr_state.attr,
-#endif
         &dev_attr_wakeup.attr,
         NULL,
 };