1 files changed, 133 insertions, 70 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 67b79a7592a9..e13614241c9e 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -95,6 +95,8 @@ static void device_release(struct kobject * kobj)
 
         if (dev->release)
                 dev->release(dev);
+        else if (dev->type && dev->type->release)
+                dev->type->release(dev);
         else if (dev->class && dev->class->dev_release)
                 dev->class->dev_release(dev);
         else {
@@ -154,25 +156,47 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj, char **envp,
                                "MINOR=%u", MINOR(dev->devt));
         }
 
-#ifdef CONFIG_SYSFS_DEPRECATED
-        /* add bus name (same as SUBSYSTEM, deprecated) */
-        if (dev->bus)
-                add_uevent_var(envp, num_envp, &i,
-                               buffer, buffer_size, &length,
-                               "PHYSDEVBUS=%s", dev->bus->name);
-#endif
-
-        /* add driver name (PHYSDEV* values are deprecated)*/
-        if (dev->driver) {
+        if (dev->driver)
                 add_uevent_var(envp, num_envp, &i,
                                buffer, buffer_size, &length,
                                "DRIVER=%s", dev->driver->name);
+
 #ifdef CONFIG_SYSFS_DEPRECATED
+        if (dev->class) {
+                struct device *parent = dev->parent;
+
+                /* find first bus device in parent chain */
+                while (parent && !parent->bus)
+                        parent = parent->parent;
+                if (parent && parent->bus) {
+                        const char *path;
+
+                        path = kobject_get_path(&parent->kobj, GFP_KERNEL);
+                        add_uevent_var(envp, num_envp, &i,
+                                       buffer, buffer_size, &length,
+                                       "PHYSDEVPATH=%s", path);
+                        kfree(path);
+
+                        add_uevent_var(envp, num_envp, &i,
+                                       buffer, buffer_size, &length,
+                                       "PHYSDEVBUS=%s", parent->bus->name);
+
+                        if (parent->driver)
+                                add_uevent_var(envp, num_envp, &i,
+                                               buffer, buffer_size, &length,
+                                               "PHYSDEVDRIVER=%s", parent->driver->name);
+                }
+        } else if (dev->bus) {
                 add_uevent_var(envp, num_envp, &i,
                                buffer, buffer_size, &length,
-                               "PHYSDEVDRIVER=%s", dev->driver->name);
-#endif
+                               "PHYSDEVBUS=%s", dev->bus->name);
+
+                if (dev->driver)
+                        add_uevent_var(envp, num_envp, &i,
+                                       buffer, buffer_size, &length,
+                                       "PHYSDEVDRIVER=%s", dev->driver->name);
         }
+#endif
 
         /* terminate, set to next free slot, shrink available space */
         envp[i] = NULL;
@@ -184,19 +208,25 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj, char **envp,
         if (dev->bus && dev->bus->uevent) {
                 /* have the bus specific function add its stuff */
                 retval = dev->bus->uevent(dev, envp, num_envp, buffer, buffer_size);
-                        if (retval) {
-                        pr_debug ("%s - uevent() returned %d\n",
+                if (retval)
+                        pr_debug ("%s: bus uevent() returned %d\n",
                                   __FUNCTION__, retval);
-                }
         }
 
         if (dev->class && dev->class->dev_uevent) {
                 /* have the class specific function add its stuff */
                 retval = dev->class->dev_uevent(dev, envp, num_envp, buffer, buffer_size);
-                        if (retval) {
-                                pr_debug("%s - dev_uevent() returned %d\n",
-                                         __FUNCTION__, retval);
-                }
+                if (retval)
+                        pr_debug("%s: class uevent() returned %d\n",
+                                 __FUNCTION__, retval);
+        }
+
+        if (dev->type && dev->type->uevent) {
+                /* have the device type specific fuction add its stuff */
+                retval = dev->type->uevent(dev, envp, num_envp, buffer, buffer_size);
+                if (retval)
+                        pr_debug("%s: dev_type uevent() returned %d\n",
+                                 __FUNCTION__, retval);
         }
 
         return retval;
@@ -247,37 +277,50 @@ static void device_remove_groups(struct device *dev)
 static int device_add_attrs(struct device *dev)
 {
         struct class *class = dev->class;
+        struct device_type *type = dev->type;
         int error = 0;
         int i;
 
-        if (!class)
-                return 0;
-
-        if (class->dev_attrs) {
+        if (class && class->dev_attrs) {
                 for (i = 0; attr_name(class->dev_attrs[i]); i++) {
                         error = device_create_file(dev, &class->dev_attrs[i]);
                         if (error)
                                 break;
                 }
+                if (error)
+                        while (--i >= 0)
+                                device_remove_file(dev, &class->dev_attrs[i]);
         }
-        if (error)
-                while (--i >= 0)
-                        device_remove_file(dev, &class->dev_attrs[i]);
+
+        if (type && type->attrs) {
+                for (i = 0; attr_name(type->attrs[i]); i++) {
+                        error = device_create_file(dev, &type->attrs[i]);
+                        if (error)
+                                break;
+                }
+                if (error)
+                        while (--i >= 0)
+                                device_remove_file(dev, &type->attrs[i]);
+        }
+
         return error;
 }
 
 static void device_remove_attrs(struct device *dev)
 {
         struct class *class = dev->class;
+        struct device_type *type = dev->type;
         int i;
 
-        if (!class)
-                return;
-
-        if (class->dev_attrs) {
+        if (class && class->dev_attrs) {
                 for (i = 0; attr_name(class->dev_attrs[i]); i++)
                         device_remove_file(dev, &class->dev_attrs[i]);
         }
+
+        if (type && type->attrs) {
+                for (i = 0; attr_name(type->attrs[i]); i++)
+                        device_remove_file(dev, &type->attrs[i]);
+        }
 }
 
 
@@ -390,22 +433,23 @@ void device_initialize(struct device *dev)
 }
 
 #ifdef CONFIG_SYSFS_DEPRECATED
-static int setup_parent(struct device *dev, struct device *parent)
+static struct kobject * get_device_parent(struct device *dev,
+                                          struct device *parent)
 {
         /* Set the parent to the class, not the parent device */
         /* this keeps sysfs from having a symlink to make old udevs happy */
         if (dev->class)
-                dev->kobj.parent = &dev->class->subsys.kset.kobj;
+                return &dev->class->subsys.kset.kobj;
         else if (parent)
-                dev->kobj.parent = &parent->kobj;
+                return &parent->kobj;
 
-        return 0;
+        return NULL;
 }
 #else
-static int virtual_device_parent(struct device *dev)
+static struct kobject * virtual_device_parent(struct device *dev)
 {
         if (!dev->class)
-                return -ENODEV;
+                return ERR_PTR(-ENODEV);
 
         if (!dev->class->virtual_dir) {
                 static struct kobject *virtual_dir = NULL;
@@ -415,25 +459,31 @@ static int virtual_device_parent(struct device *dev)
                 dev->class->virtual_dir = kobject_add_dir(virtual_dir, dev->class->name);
         }
 
-        dev->kobj.parent = dev->class->virtual_dir;
-        return 0;
+        return dev->class->virtual_dir;
 }
 
-static int setup_parent(struct device *dev, struct device *parent)
+static struct kobject * get_device_parent(struct device *dev,
+                                          struct device *parent)
 {
-        int error;
-
         /* if this is a class device, and has no parent, create one */
         if ((dev->class) && (parent == NULL)) {
-                error = virtual_device_parent(dev);
-                if (error)
-                        return error;
+                return virtual_device_parent(dev);
         } else if (parent)
-                dev->kobj.parent = &parent->kobj;
+                return &parent->kobj;
+        return NULL;
+}
 
+#endif
+static int setup_parent(struct device *dev, struct device *parent)
+{
+        struct kobject *kobj;
+        kobj = get_device_parent(dev, parent);
+        if (IS_ERR(kobj))
+                return PTR_ERR(kobj);
+        if (kobj)
+                dev->kobj.parent = kobj;
         return 0;
 }
-#endif
 
 /**
  *      device_add - add device to device hierarchy.
@@ -520,9 +570,13 @@ int device_add(struct device *dev)
                                           &dev->kobj, dev->bus_id);
 #ifdef CONFIG_SYSFS_DEPRECATED
                 if (parent) {
-                        sysfs_create_link(&dev->kobj, &dev->parent->kobj, "device");
-                        class_name = make_class_name(dev->class->name, &dev->kobj);
-                        sysfs_create_link(&dev->parent->kobj, &dev->kobj, class_name);
+                        sysfs_create_link(&dev->kobj, &dev->parent->kobj,
+                                                        "device");
+                        class_name = make_class_name(dev->class->name,
+                                                        &dev->kobj);
+                        if (class_name)
+                                sysfs_create_link(&dev->parent->kobj,
+                                                  &dev->kobj, class_name);
                 }
 #endif
         }
@@ -535,7 +589,8 @@ int device_add(struct device *dev)
                 goto PMError;
         if ((error = bus_add_device(dev)))
                 goto BusError;
-        kobject_uevent(&dev->kobj, KOBJ_ADD);
+        if (!dev->uevent_suppress)
+                kobject_uevent(&dev->kobj, KOBJ_ADD);
         if ((error = bus_attach_device(dev)))
                 goto AttachError;
         if (parent)
@@ -665,7 +720,9 @@ void device_del(struct device * dev)
                 if (parent) {
                         char *class_name = make_class_name(dev->class->name,
                                                            &dev->kobj);
-                        sysfs_remove_link(&dev->parent->kobj, class_name);
+                        if (class_name)
+                                sysfs_remove_link(&dev->parent->kobj,
+                                                  class_name);
                         kfree(class_name);
                         sysfs_remove_link(&dev->kobj, "device");
                 }
@@ -968,20 +1025,25 @@ static int device_move_class_links(struct device *dev,
 
         class_name = make_class_name(dev->class->name, &dev->kobj);
         if (!class_name) {
-                error = PTR_ERR(class_name);
-                class_name = NULL;
+                error = -ENOMEM;
                 goto out;
         }
         if (old_parent) {
                 sysfs_remove_link(&dev->kobj, "device");
                 sysfs_remove_link(&old_parent->kobj, class_name);
         }
-        error = sysfs_create_link(&dev->kobj, &new_parent->kobj, "device");
-        if (error)
-                goto out;
-        error = sysfs_create_link(&new_parent->kobj, &dev->kobj, class_name);
-        if (error)
-                sysfs_remove_link(&dev->kobj, "device");
+        if (new_parent) {
+                error = sysfs_create_link(&dev->kobj, &new_parent->kobj,
+                                          "device");
+                if (error)
+                        goto out;
+                error = sysfs_create_link(&new_parent->kobj, &dev->kobj,
+                                          class_name);
+                if (error)
+                        sysfs_remove_link(&dev->kobj, "device");
+        }
+        else
+                error = 0;
 out:
         kfree(class_name);
         return error;
@@ -993,29 +1055,28 @@ out:
 /**
  * device_move - moves a device to a new parent
  * @dev: the pointer to the struct device to be moved
- * @new_parent: the new parent of the device
+ * @new_parent: the new parent of the device (can by NULL)
  */
 int device_move(struct device *dev, struct device *new_parent)
 {
         int error;
         struct device *old_parent;
+        struct kobject *new_parent_kobj;
 
         dev = get_device(dev);
         if (!dev)
                 return -EINVAL;
 
-        if (!device_is_registered(dev)) {
-                error = -EINVAL;
-                goto out;
-        }
         new_parent = get_device(new_parent);
-        if (!new_parent) {
-                error = -EINVAL;
+        new_parent_kobj = get_device_parent (dev, new_parent);
+        if (IS_ERR(new_parent_kobj)) {
+                error = PTR_ERR(new_parent_kobj);
+                put_device(new_parent);
                 goto out;
         }
         pr_debug("DEVICE: moving '%s' to '%s'\n", dev->bus_id,
-                new_parent->bus_id);
-        error = kobject_move(&dev->kobj, &new_parent->kobj);
+                 new_parent ? new_parent->bus_id : "<NULL>");
+        error = kobject_move(&dev->kobj, new_parent_kobj);
         if (error) {
                 put_device(new_parent);
                 goto out;
@@ -1024,7 +1085,8 @@ int device_move(struct device *dev, struct device *new_parent)
         dev->parent = new_parent;
         if (old_parent)
                 klist_remove(&dev->knode_parent);
-        klist_add_tail(&dev->knode_parent, &new_parent->klist_children);
+        if (new_parent)
+                klist_add_tail(&dev->knode_parent, &new_parent->klist_children);
         if (!dev->class)
                 goto out_put;
         error = device_move_class_links(dev, old_parent, new_parent);
@@ -1032,7 +1094,8 @@ int device_move(struct device *dev, struct device *new_parent)
                 /* We ignore errors on cleanup since we're hosed anyway... */
                 device_move_class_links(dev, new_parent, old_parent);
                 if (!kobject_move(&dev->kobj, &old_parent->kobj)) {
-                        klist_remove(&dev->knode_parent);
+                        if (new_parent)
+                                klist_remove(&dev->knode_parent);
                         if (old_parent)
                                 klist_add_tail(&dev->knode_parent,
                                                &old_parent->klist_children);