Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  firmware: remove orphaned Email
  kobject: use the proper printk level for kobject error
  Driver core: kill unused code
  Driver core: keep PHYSDEV for old struct class_device
  update Documentation/driver-model/platform.txt

4 files changed, 29 insertions, 57 deletions

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 20c4ea6eb50d..8c506dbe3913 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -369,36 +369,6 @@ char *make_class_name(const char *name, struct kobject *kobj)
         return class_name;
 }
 
-static int deprecated_class_uevent(char **envp, int num_envp, int *cur_index,
-                                   char *buffer, int buffer_size,
-                                   int *cur_len,
-                                   struct class_device *class_dev)
-{
-        struct device *dev = class_dev->dev;
-        char *path;
-
-        if (!dev)
-                return 0;
-
-        /* add device, backing this class device (deprecated) */
-        path = kobject_get_path(&dev->kobj, GFP_KERNEL);
-
-        add_uevent_var(envp, num_envp, cur_index, buffer, buffer_size,
-                       cur_len, "PHYSDEVPATH=%s", path);
-        kfree(path);
-
-        if (dev->bus)
-                add_uevent_var(envp, num_envp, cur_index,
-                               buffer, buffer_size, cur_len,
-                               "PHYSDEVBUS=%s", dev->bus->name);
-
-        if (dev->driver)
-                add_uevent_var(envp, num_envp, cur_index,
-                               buffer, buffer_size, cur_len,
-                               "PHYSDEVDRIVER=%s", dev->driver->name);
-        return 0;
-}
-
 static int make_deprecated_class_device_links(struct class_device *class_dev)
 {
         char *class_name;
@@ -430,11 +400,6 @@ static void remove_deprecated_class_device_links(struct class_device *class_dev)
         kfree(class_name);
 }
 #else
-static inline int deprecated_class_uevent(char **envp, int num_envp,
-                                          int *cur_index, char *buffer,
-                                          int buffer_size, int *cur_len,
-                                          struct class_device *class_dev)
-{ return 0; }
 static inline int make_deprecated_class_device_links(struct class_device *cd)
 { return 0; }
 static void remove_deprecated_class_device_links(struct class_device *cd)
@@ -445,15 +410,13 @@ static int class_uevent(struct kset *kset, struct kobject *kobj, char **envp,
                          int num_envp, char *buffer, int buffer_size)
 {
         struct class_device *class_dev = to_class_dev(kobj);
+        struct device *dev = class_dev->dev;
         int i = 0;
         int length = 0;
         int retval = 0;
 
         pr_debug("%s - name = %s\n", __FUNCTION__, class_dev->class_id);
 
-        deprecated_class_uevent(envp, num_envp, &i, buffer, buffer_size,
-                                &length, class_dev);
-
         if (MAJOR(class_dev->devt)) {
                 add_uevent_var(envp, num_envp, &i,
                                buffer, buffer_size, &length,
@@ -464,6 +427,26 @@ static int class_uevent(struct kset *kset, struct kobject *kobj, char **envp,
                                "MINOR=%u", MINOR(class_dev->devt));
         }
 
+        if (dev) {
+                const char *path = kobject_get_path(&dev->kobj, GFP_KERNEL);
+                if (path) {
+                        add_uevent_var(envp, num_envp, &i,
+                                       buffer, buffer_size, &length,
+                                       "PHYSDEVPATH=%s", path);
+                        kfree(path);
+                }
+
+                if (dev->bus)
+                        add_uevent_var(envp, num_envp, &i,
+                                       buffer, buffer_size, &length,
+                                       "PHYSDEVBUS=%s", dev->bus->name);
+
+                if (dev->driver)
+                        add_uevent_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];
diff --git a/drivers/base/core.c b/drivers/base/core.c
index b78fc1e68264..dd40d78a023d 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -180,10 +180,12 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj, char **envp,
                         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);
+                        if (path) {
+                                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,
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 92428e55b0c2..b0088b0efecd 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -207,19 +207,6 @@ static int __device_attach(struct device_driver * drv, void * data)
         return driver_probe_device(drv, dev);
 }
 
-static int device_probe_drivers(void *data)
-{
-        struct device *dev = data;
-        int ret = 0;
-
-        if (dev->bus) {
-                down(&dev->sem);
-                ret = bus_for_each_drv(dev->bus, NULL, dev, __device_attach);
-                up(&dev->sem);
-        }
-        return ret;
-}
-
 /**
  *      device_attach - try to attach device to a driver.
  *      @dev:   device.
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 97ab5bd1c4d6..89a5f4a54913 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -1,7 +1,7 @@
 /*
  * firmware_class.c - Multi purpose firmware loading support
  *
- * Copyright (c) 2003 Manuel Estrada Sainz <ranty@debian.org>
+ * Copyright (c) 2003 Manuel Estrada Sainz
  *
  * Please see Documentation/firmware_class/ for more information.
  *
@@ -23,7 +23,7 @@
 
 #define to_dev(obj) container_of(obj, struct device, kobj)
 
-MODULE_AUTHOR("Manuel Estrada Sainz <ranty@debian.org>");
+MODULE_AUTHOR("Manuel Estrada Sainz");
 MODULE_DESCRIPTION("Multi purpose firmware loading support");
 MODULE_LICENSE("GPL");