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: (75 commits)
  PM: merge device power-management source files
  sysfs: add copyrights
  kobject: update the copyrights
  kset: add some kerneldoc to help describe what these strange things are
  Driver core: rename ktype_edd and ktype_efivar
  Driver core: rename ktype_driver
  Driver core: rename ktype_device
  Driver core: rename ktype_class
  driver core: remove subsystem_init()
  sysfs: move sysfs file poll implementation to sysfs_open_dirent
  sysfs: implement sysfs_open_dirent
  sysfs: move sysfs_dirent->s_children into sysfs_dirent->s_dir
  sysfs: make sysfs_root a regular directory dirent
  sysfs: open code sysfs_attach_dentry()
  sysfs: make s_elem an anonymous union
  sysfs: make bin attr open get active reference of parent too
  sysfs: kill unnecessary NULL pointer check in sysfs_release()
  sysfs: kill unnecessary sysfs_get() in open paths
  sysfs: reposition sysfs_dirent->s_mode.
  sysfs: kill sysfs_update_file()
  ...

4 files changed, 8 insertions, 18 deletions

diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c
index f094a0879c16..9ef07eda2c43 100644
--- a/net/atm/atm_sysfs.c
+++ b/net/atm/atm_sysfs.c
@@ -105,10 +105,9 @@ static struct class_device_attribute *atm_attrs[] = {
         NULL
 };
 
-static int atm_uevent(struct class_device *cdev, char **envp, int num_envp, char *buf, int size)
+static int atm_uevent(struct class_device *cdev, struct kobj_uevent_env *env)
 {
         struct atm_dev *adev;
-        int i = 0, len = 0;
 
         if (!cdev)
                 return -ENODEV;
@@ -117,11 +116,9 @@ static int atm_uevent(struct class_device *cdev, char **envp, int num_envp, char
         if (!adev)
                 return -ENODEV;
 
-        if (add_uevent_var(envp, num_envp, &i, buf, size, &len,
-                           "NAME=%s%d", adev->type, adev->number))
+        if (add_uevent_var(env, "NAME=%s%d", adev->type, adev->number))
                 return -ENOMEM;
 
-        envp[i] = NULL;
         return 0;
 }
 
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index c65f54e0e27f..3312e8f2abe4 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -435,7 +435,7 @@ int br_sysfs_addbr(struct net_device *dev)
         err = kobject_register(&br->ifobj);
         if (err) {
                 pr_info("%s: can't add kobject (directory) %s/%s\n",
-                        __FUNCTION__, dev->name, br->ifobj.name);
+                        __FUNCTION__, dev->name, kobject_name(&br->ifobj));
                 goto out3;
         }
         return 0;
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 909a03d6c0e9..6628e457ddc0 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -396,28 +396,22 @@ static struct attribute_group wireless_group = {
 #endif /* CONFIG_SYSFS */
 
 #ifdef CONFIG_HOTPLUG
-static int netdev_uevent(struct device *d, char **envp,
-                         int num_envp, char *buf, int size)
+static int netdev_uevent(struct device *d, struct kobj_uevent_env *env)
 {
         struct net_device *dev = to_net_dev(d);
-        int retval, len = 0, i = 0;
+        int retval;
 
         /* pass interface to uevent. */
-        retval = add_uevent_var(envp, num_envp, &i,
-                                buf, size, &len,
-                                "INTERFACE=%s", dev->name);
+        retval = add_uevent_var(env, "INTERFACE=%s", dev->name);
         if (retval)
                 goto exit;
 
         /* pass ifindex to uevent.
          * ifindex is useful as it won't change (interface name may change)
          * and is what RtNetlink uses natively. */
-        retval = add_uevent_var(envp, num_envp, &i,
-                                buf, size, &len,
-                                "IFINDEX=%d", dev->ifindex);
+        retval = add_uevent_var(env, "IFINDEX=%d", dev->ifindex);
 
 exit:
-        envp[i] = NULL;
         return retval;
 }
 #endif
diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c
index 2d5d2255a27c..29f820e18251 100644
--- a/net/wireless/sysfs.c
+++ b/net/wireless/sysfs.c
@@ -53,8 +53,7 @@ static void wiphy_dev_release(struct device *dev)
 }
 
 #ifdef CONFIG_HOTPLUG
-static int wiphy_uevent(struct device *dev, char **envp,
-                        int num_envp, char *buf, int size)
+static int wiphy_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         /* TODO, we probably need stuff here */
         return 0;