power-supply: Drop useless 'if (ret.intval)' statements

There is no need to check the value of ret.intval before returning it, as we
will be returning zero explicitly when ret.intval is zero.

So essentially we will end up returning value of ret.intval as it is. Drop the
unnecessary 'if' statements.

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

diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 55140ebf914c26af0bebc73e91543aac265b937b..bcff7fdf733ab96dd7edcecf50b9820785fe56e1 100644 (file)
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -265,10 +265,8 @@ static int __power_supply_am_i_supplied(struct device *dev, void *data)
        struct power_supply *epsy = dev_get_drvdata(dev);
 
        if (__power_supply_is_supplied_by(epsy, psy))
-               if (!epsy->get_property(epsy, POWER_SUPPLY_PROP_ONLINE, &ret)) {
-                       if (ret.intval)
-                               return ret.intval;
-               }
+               if (!epsy->get_property(epsy, POWER_SUPPLY_PROP_ONLINE, &ret))
+                       return ret.intval;
 
        return 0;
 }
@@ -293,12 +291,10 @@ static int __power_supply_is_system_supplied(struct device *dev, void *data)
        unsigned int *count = data;
 
        (*count)++;
-       if (psy->type != POWER_SUPPLY_TYPE_BATTERY) {
-               if (psy->get_property(psy, POWER_SUPPLY_PROP_ONLINE, &ret))
-                       return 0;
-               if (ret.intval)
+       if (psy->type != POWER_SUPPLY_TYPE_BATTERY)
+               if (!psy->get_property(psy, POWER_SUPPLY_PROP_ONLINE, &ret))
                        return ret.intval;
-       }
+
        return 0;
 }