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()
  ...

2 files changed, 8 insertions, 20 deletions

diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 9c3b9ea1e66f..5baa517c3b66 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -44,8 +44,7 @@ ccwgroup_bus_match (struct device * dev, struct device_driver * drv)
         return 0;
 }
 static int
-ccwgroup_uevent (struct device *dev, char **envp, int num_envp, char *buffer,
-                  int buffer_size)
+ccwgroup_uevent (struct device *dev, struct kobj_uevent_env *env)
 {
         /* TODO */
         return 0;
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 39f02b48e4c7..7ee57f084a89 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -79,49 +79,38 @@ static int snprint_alias(char *buf, size_t size,
 
 /* Set up environment variables for ccw device uevent. Return 0 on success,
  * non-zero otherwise. */
-static int ccw_uevent(struct device *dev, char **envp, int num_envp,
-                      char *buffer, int buffer_size)
+static int ccw_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         struct ccw_device *cdev = to_ccwdev(dev);
         struct ccw_device_id *id = &(cdev->id);
-        int i = 0;
-        int len = 0;
         int ret;
         char modalias_buf[30];
 
         /* CU_TYPE= */
-        ret = add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &len,
-                             "CU_TYPE=%04X", id->cu_type);
+        ret = add_uevent_var(env, "CU_TYPE=%04X", id->cu_type);
         if (ret)
                 return ret;
 
         /* CU_MODEL= */
-        ret = add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &len,
-                             "CU_MODEL=%02X", id->cu_model);
+        ret = add_uevent_var(env, "CU_MODEL=%02X", id->cu_model);
         if (ret)
                 return ret;
 
         /* The next two can be zero, that's ok for us */
         /* DEV_TYPE= */
-        ret = add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &len,
-                             "DEV_TYPE=%04X", id->dev_type);
+        ret = add_uevent_var(env, "DEV_TYPE=%04X", id->dev_type);
         if (ret)
                 return ret;
 
         /* DEV_MODEL= */
-        ret = add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &len,
-                             "DEV_MODEL=%02X", id->dev_model);
+        ret = add_uevent_var(env, "DEV_MODEL=%02X", id->dev_model);
         if (ret)
                 return ret;
 
         /* MODALIAS=  */
         snprint_alias(modalias_buf, sizeof(modalias_buf), id, "");
-        ret = add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &len,
-                             "MODALIAS=%s", modalias_buf);
-        if (ret)
-                return ret;
-        envp[i] = NULL;
-        return 0;
+        ret = add_uevent_var(env, "MODALIAS=%s", modalias_buf);
+        return ret;
 }
 
 struct bus_type ccw_bus_type;