mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
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>
This commit is contained in:
parent
9d2410c79b
commit
73b4a087ba
1 changed files with 11 additions and 10 deletions
|
@ -73,19 +73,20 @@ static ssize_t power_supply_show_property(struct device *dev,
|
||||||
const ptrdiff_t off = attr - power_supply_attrs;
|
const ptrdiff_t off = attr - power_supply_attrs;
|
||||||
union power_supply_propval value;
|
union power_supply_propval value;
|
||||||
|
|
||||||
if (off == POWER_SUPPLY_PROP_TYPE)
|
if (off == POWER_SUPPLY_PROP_TYPE) {
|
||||||
value.intval = psy->type;
|
value.intval = psy->type;
|
||||||
else
|
} else {
|
||||||
ret = psy->get_property(psy, off, &value);
|
ret = psy->get_property(psy, off, &value);
|
||||||
|
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
if (ret == -ENODATA)
|
if (ret == -ENODATA)
|
||||||
dev_dbg(dev, "driver has no data for `%s' property\n",
|
dev_dbg(dev, "driver has no data for `%s' property\n",
|
||||||
attr->attr.name);
|
attr->attr.name);
|
||||||
else if (ret != -ENODEV)
|
else if (ret != -ENODEV)
|
||||||
dev_err(dev, "driver failed to report `%s' property: %zd\n",
|
dev_err(dev, "driver failed to report `%s' property: %zd\n",
|
||||||
attr->attr.name, ret);
|
attr->attr.name, ret);
|
||||||
return ret;
|
return ret;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (off == POWER_SUPPLY_PROP_STATUS)
|
if (off == POWER_SUPPLY_PROP_STATUS)
|
||||||
|
|
Loading…
Reference in a new issue