Merge tag 'iommu-updates-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / power / power_supply_sysfs.c

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 750a202..62653f5 100644 (file)
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -73,19 +73,20 @@ static ssize_t power_supply_show_property(struct device *dev,
        const ptrdiff_t off = attr - power_supply_attrs;
        union power_supply_propval value;
 
-       if (off == POWER_SUPPLY_PROP_TYPE)
+       if (off == POWER_SUPPLY_PROP_TYPE) {
                value.intval = psy->type;
-       else
+       } else {
                ret = psy->get_property(psy, off, &value);
 
-       if (ret < 0) {
-               if (ret == -ENODATA)
-                       dev_dbg(dev, "driver has no data for `%s' property\n",
-                               attr->attr.name);
-               else if (ret != -ENODEV)
-                       dev_err(dev, "driver failed to report `%s' property: %zd\n",
-                               attr->attr.name, ret);
-               return ret;
+               if (ret < 0) {
+                       if (ret == -ENODATA)
+                               dev_dbg(dev, "driver has no data for `%s' property\n",
+                                       attr->attr.name);
+                       else if (ret != -ENODEV)
+                               dev_err(dev, "driver failed to report `%s' property: %zd\n",
+                                       attr->attr.name, ret);
+                       return ret;
+               }
        }
 
        if (off == POWER_SUPPLY_PROP_STATUS)
@@ -149,9 +150,11 @@ static struct device_attribute power_supply_attrs[] = {
        POWER_SUPPLY_ATTR(voltage_now),
        POWER_SUPPLY_ATTR(voltage_avg),
        POWER_SUPPLY_ATTR(voltage_ocv),
+       POWER_SUPPLY_ATTR(voltage_boot),
        POWER_SUPPLY_ATTR(current_max),
        POWER_SUPPLY_ATTR(current_now),
        POWER_SUPPLY_ATTR(current_avg),
+       POWER_SUPPLY_ATTR(current_boot),
        POWER_SUPPLY_ATTR(power_now),
        POWER_SUPPLY_ATTR(power_avg),
        POWER_SUPPLY_ATTR(charge_full_design),
@@ -193,6 +196,7 @@ static struct device_attribute power_supply_attrs[] = {
        POWER_SUPPLY_ATTR(type),
        POWER_SUPPLY_ATTR(scope),
        POWER_SUPPLY_ATTR(charge_term_current),
+       POWER_SUPPLY_ATTR(calibrate),
        /* Properties of type `const char *' */
        POWER_SUPPLY_ATTR(model_name),
        POWER_SUPPLY_ATTR(manufacturer),