power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL

[karo-tx-linux.git] / drivers / power / power_supply_sysfs.c

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index c7c4574729b190c6358e57e7f02d04427be3c029..7a2163fa61c3591d9b9c97420997bb4142bd3404 100644 (file)
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -14,6 +14,8 @@
 #include <linux/ctype.h>
 #include <linux/power_supply.h>
 
+#include "power_supply.h"
+
 /*
  * This is because the name "current" breaks the device attr macro.
  * The "current" word resolves to "(get_current())" so instead of
@@ -48,9 +50,6 @@ static ssize_t power_supply_show_property(struct device *dev,
        static char *technology_text[] = {
                "Unknown", "NiMH", "Li-ion", "Li-poly", "LiFe", "NiCd"
        };
-       static char *capacity_level_text[] = {
-               "Unknown", "Critical", "Low", "Normal", "High", "Full"
-       };
        ssize_t ret;
        struct power_supply *psy = dev_get_drvdata(dev);
        const ptrdiff_t off = attr - power_supply_attrs;
@@ -71,9 +70,6 @@ static ssize_t power_supply_show_property(struct device *dev,
                return sprintf(buf, "%s\n", health_text[value.intval]);
        else if (off == POWER_SUPPLY_PROP_TECHNOLOGY)
                return sprintf(buf, "%s\n", technology_text[value.intval]);
-       else if (off == POWER_SUPPLY_PROP_CAPACITY_LEVEL)
-               return sprintf(buf, "%s\n",
-                              capacity_level_text[value.intval]);
        else if (off >= POWER_SUPPLY_PROP_MODEL_NAME)
                return sprintf(buf, "%s\n", value.strval);
 
@@ -195,11 +191,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 +207,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 +237,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,9 +274,7 @@ 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;