This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / base / core.c

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 4e6cce8..4d9a44e 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -116,29 +116,8 @@ static int dev_hotplug(struct kset *kset, struct kobject *kobj, char **envp,
                        int num_envp, char *buffer, int buffer_size)
 {
        struct device *dev = to_dev(kobj);
-       int i = 0;
-       int length = 0;
        int retval = 0;
 
-       /* add bus name of physical device */
-       if (dev->bus)
-               add_hotplug_env_var(envp, num_envp, &i,
-                                   buffer, buffer_size, &length,
-                                   "PHYSDEVBUS=%s", dev->bus->name);
-
-       /* add driver name of physical device */
-       if (dev->driver)
-               add_hotplug_env_var(envp, num_envp, &i,
-                                   buffer, buffer_size, &length,
-                                   "PHYSDEVDRIVER=%s", dev->driver->name);
-
-       /* terminate, set to next free slot, shrink available space */
-       envp[i] = NULL;
-       envp = &envp[i];
-       num_envp -= i;
-       buffer = &buffer[length];
-       buffer_size -= length;
-
        if (dev->bus->hotplug) {
                /* have the bus specific function add its stuff */
                retval = dev->bus->hotplug (dev, envp, num_envp, buffer, buffer_size);
@@ -230,19 +209,19 @@ void device_initialize(struct device *dev)
  */
 int device_add(struct device *dev)
 {
-       struct device *parent = NULL;
-       int error = -EINVAL;
+       struct device * parent;
+       int error;
 
        dev = get_device(dev);
        if (!dev || !strlen(dev->bus_id))
-               goto Error;
+               return -EINVAL;
 
        parent = get_device(dev->parent);
 
        pr_debug("DEV: registering device: ID = '%s'\n", dev->bus_id);
 
        /* first, register with generic layer. */
-       kobject_set_name(&dev->kobj, "%s", dev->bus_id);
+       kobject_set_name(&dev->kobj, dev->bus_id);
        if (parent)
                dev->kobj.parent = &parent->kobj;
 
@@ -314,8 +293,7 @@ struct device * get_device(struct device * dev)
  */
 void put_device(struct device * dev)
 {
-       if (dev)
-               kobject_put(&dev->kobj);
+       kobject_put(&dev->kobj);
 }