Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6: (68 commits)
  power_supply: Mark da9052 driver as broken
  power_supply: Drop usage of nowarn variant of sysfs_create_link()
  s3c_adc_battery: Average over more than one adc sample
  power_supply: Add DA9052 battery driver
  isp1704_charger: Fix missing check
  jz4740-battery: Fix signedness bug
  power_supply: Assume mains power by default
  sbs-battery: Fix devicetree match table
  ARM: rx51: Add bq27200 i2c board info
  sbs-battery: Change power supply name
  devicetree-bindings: Propagate bq20z75->sbs rename to dt bindings
  devicetree-bindings: Add vendor entry for Smart Battery Systems
  sbs-battery: Rename internals to new name
  bq20z75: Rename to sbs-battery
  wm97xx_battery: Use DEFINE_MUTEX() for work_lock
  max8997_charger: Remove duplicate module.h
  lp8727_charger: Some minor fixes for the header
  lp8727_charger: Add header file
  power_supply: Convert drivers/power/* to use module_platform_driver()
  power_supply: Add "unknown" in power supply type
  ...

1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index e95cd657dac2..b52b57ca3084 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -43,7 +43,7 @@ static ssize_t power_supply_show_property(struct device *dev,
                                           struct device_attribute *attr,
                                           char *buf) {
         static char *type_text[] = {
-                "Battery", "UPS", "Mains", "USB",
+                "Unknown", "Battery", "UPS", "Mains", "USB",
                 "USB_DCP", "USB_CDP", "USB_ACA"
         };
         static char *status_text[] = {
@@ -63,6 +63,9 @@ static ssize_t power_supply_show_property(struct device *dev,
         static char *capacity_level_text[] = {
                 "Unknown", "Critical", "Low", "Normal", "High", "Full"
         };
+        static char *scope_text[] = {
+                "Unknown", "System", "Device"
+        };
         ssize_t ret = 0;
         struct power_supply *psy = dev_get_drvdata(dev);
         const ptrdiff_t off = attr - power_supply_attrs;
@@ -78,8 +81,8 @@ static ssize_t power_supply_show_property(struct device *dev,
                         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\n",
-                                attr->attr.name);
+                        dev_err(dev, "driver failed to report `%s' property: %zd\n",
+                                attr->attr.name, ret);
                 return ret;
         }
 
@@ -95,6 +98,8 @@ static ssize_t power_supply_show_property(struct device *dev,
                 return sprintf(buf, "%s\n", capacity_level_text[value.intval]);
         else if (off == POWER_SUPPLY_PROP_TYPE)
                 return sprintf(buf, "%s\n", type_text[value.intval]);
+        else if (off == POWER_SUPPLY_PROP_SCOPE)
+                return sprintf(buf, "%s\n", scope_text[value.intval]);
         else if (off >= POWER_SUPPLY_PROP_MODEL_NAME)
                 return sprintf(buf, "%s\n", value.strval);
 
@@ -167,6 +172,7 @@ static struct device_attribute power_supply_attrs[] = {
         POWER_SUPPLY_ATTR(time_to_full_now),
         POWER_SUPPLY_ATTR(time_to_full_avg),
         POWER_SUPPLY_ATTR(type),
+        POWER_SUPPLY_ATTR(scope),
         /* Properties of type `const char *' */
         POWER_SUPPLY_ATTR(model_name),
         POWER_SUPPLY_ATTR(manufacturer),