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

1 files changed, 5 insertions, 12 deletions

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index de3155b21285..249f61bae639 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -195,11 +195,10 @@ static char *kstruprdup(const char *str, gfp_t gfp)
         return ret;
 }
 
-int power_supply_uevent(struct device *dev, char **envp, int num_envp,
-                        char *buffer, int buffer_size)
+int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         struct power_supply *psy = dev_get_drvdata(dev);
-        int i = 0, length = 0, ret = 0, j;
+        int ret = 0, j;
         char *prop_buf;
         char *attrname;
 
@@ -212,8 +211,7 @@ int power_supply_uevent(struct device *dev, char **envp, int num_envp,
 
         dev_dbg(dev, "POWER_SUPPLY_NAME=%s\n", psy->name);
 
-        ret = add_uevent_var(envp, num_envp, &i, buffer, buffer_size,
-                             &length, "POWER_SUPPLY_NAME=%s", psy->name);
+        ret = add_uevent_var(env, "POWER_SUPPLY_NAME=%s", psy->name);
         if (ret)
                 return ret;
 
@@ -243,9 +241,7 @@ int power_supply_uevent(struct device *dev, char **envp, int num_envp,
 
                 dev_dbg(dev, "Static prop %s=%s\n", attrname, prop_buf);
 
-                ret = add_uevent_var(envp, num_envp, &i, buffer, buffer_size,
-                                     &length, "POWER_SUPPLY_%s=%s",
-                                     attrname, prop_buf);
+                ret = add_uevent_var(env, "POWER_SUPPLY_%s=%s", attrname, prop_buf);
                 kfree(attrname);
                 if (ret)
                         goto out;
@@ -282,14 +278,11 @@ int power_supply_uevent(struct device *dev, char **envp, int num_envp,
 
                 dev_dbg(dev, "prop %s=%s\n", attrname, prop_buf);
 
-                ret = add_uevent_var(envp, num_envp, &i, buffer, buffer_size,
-                                     &length, "POWER_SUPPLY_%s=%s",
-                                     attrname, prop_buf);
+                ret = add_uevent_var(env, "POWER_SUPPLY_%s=%s", attrname, prop_buf);
                 kfree(attrname);
                 if (ret)
                         goto out;
         }
-        envp[i] = NULL;
 
 out:
         free_page((unsigned long)prop_buf);