power-supply: Check for failures only when we can fail

In power_supply_show_property() routine, we call ->get_property() conditionally
and should check for failure in that case only. There is no point comparing
'ret' for errors when 'ret' is surely zero.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

1 files changed, 11 insertions, 10 deletions

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 7e4726d37211..62653f50a524 100644
--- 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)