From: Viresh Kumar <viresh.kumar@linaro.org>
To: sre@kernel.org, dbaryshkov@gmail.com, dwmw2@infradead.org,
anton@enomsg.org
Cc: linux-pm@vger.kernel.org, linaro-kernel@lists.linaro.org,
Viresh Kumar <viresh.kumar@linaro.org>
Subject: [PATCH 13/15] power-supply: Check for failures only when we can fail
Date: Thu, 4 Sep 2014 17:31:34 +0530 [thread overview]
Message-ID: <b53eff32f02a045db2d40825ac0f666246f66411.1409831636.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <2eacd908a8094887cc1796f75ae0513be8a3e36d.1409831636.git.viresh.kumar@linaro.org>
In-Reply-To: <cover.1409831636.git.viresh.kumar@linaro.org>
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>
---
drivers/power/power_supply_sysfs.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 750a202..c23b1b2 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)
--
2.0.3.693.g996b0fd
next prev parent reply other threads:[~2014-09-04 12:03 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-04 12:00 [PATCH 00/15] power_supply: Fixes & cleanups Viresh Kumar
2014-09-04 12:01 ` [PATCH 01/15] power-supply: Don't over-allocate memory for "supplied-from" array Viresh Kumar
2014-09-04 12:01 ` [PATCH 02/15] power-supply: Return early if "power-supplies" property isn't valid Viresh Kumar
2014-09-04 12:01 ` [PATCH 03/15] Documentation: Charger Manager: Fix spelling mistakes Viresh Kumar
2014-09-04 12:01 ` [PATCH 04/15] power-supply: Forward declare structs together Viresh Kumar
2014-09-04 12:01 ` [PATCH 05/15] power-supply: Drop unnecessary typecasts Viresh Kumar
2014-09-04 12:01 ` [PATCH 06/15] power-supply: Use 'break' instead of 'continue' to end loop Viresh Kumar
2014-09-04 12:01 ` [PATCH 07/15] power-supply: Rearrange code to remove duplicate lines Viresh Kumar
2014-09-04 12:01 ` [PATCH 08/15] power-supply: Propagate error returned by power_supply_find_supply_from_node() Viresh Kumar
2014-09-04 12:01 ` [PATCH 09/15] power-supply: Don't return -EINVAL from __power_supply_find_supply_from_node() Viresh Kumar
2014-09-04 12:01 ` [PATCH 10/15] power-supply: Drop useless 'if (ret.intval)' statements Viresh Kumar
2014-09-04 12:01 ` [PATCH 11/15] power-supply: Mark 'if' blocks in power_supply_changed_work() with 'likely' Viresh Kumar
2014-09-04 12:01 ` [PATCH 12/15] power-supply: Use PTR_ERR_OR_ZERO() routine Viresh Kumar
2014-09-04 12:01 ` Viresh Kumar [this message]
2014-09-04 12:01 ` [PATCH 14/15] power-supply: Avoid unnecessary 'goto' statements Viresh Kumar
2014-09-04 12:01 ` [PATCH 15/15] power_supply: Don't iterate over devices to return -EPROBE_DEFER Viresh Kumar
2014-10-01 3:19 ` [PATCH 00/15] power_supply: Fixes & cleanups Viresh Kumar
2014-10-01 15:08 ` Sebastian Reichel
2014-10-02 5:26 ` Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b53eff32f02a045db2d40825ac0f666246f66411.1409831636.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=anton@enomsg.org \
--cc=dbaryshkov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-pm@vger.kernel.org \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).