From: Nishanth Menon <nm@ti.com>
To: <broonie@opensource.wolfsonmicro.com>
Cc: <cpufreq@vger.kernel.org>, <linux-pm@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <lgirdwood@gmail.com>,
<rjw@sisk.pl>, <viresh.kumar@linaro.org>, <shawn.guo@linaro.org>,
Nishanth Menon <nm@ti.com>
Subject: [PATCH V2 1/2] regulator: core: return err value for regulator_get if there is no DT binding
Date: Tue, 16 Apr 2013 16:45:16 -0500 [thread overview]
Message-ID: <1366148717-12586-1-git-send-email-nm@ti.com> (raw)
In-Reply-To: <20130405101754.GD6597@opensource.wolfsonmicro.com>
commit 6d191a5fc7a969d972f1681e1c23781aecb06a61
(regulator: core: Don't defer probe if there's no DT binding for a supply)
Attempted to differentiate between regulator_get() with an actual
DT binding for the supply and when there is none to avoid unnecessary
deferal.
However, ret value supplied by regulator_dev_lookup() is being
ignored by regulator_get(). So, exit with the appropriate return value.
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
---
based on v3.9-rc7
Changes in v2 (review comments update):
- simplified commit log
- error handling inline with rest of function
Available at: https://github.com/nmenon/linux-2.6-playground/commits/push/cpufreq-regulator-fixing-v2
V1:
https://patchwork.kernel.org/patch/2396571/
(original depending cpufreq patch: https://patchwork.kernel.org/patch/2396541/
- no change expected- so not reposting unless requested)
drivers/regulator/core.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index e3661c2..cfe8b84 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1229,7 +1229,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
struct regulator_dev *rdev;
struct regulator *regulator = ERR_PTR(-EPROBE_DEFER);
const char *devname = NULL;
- int ret;
+ int ret = 0;
if (id == NULL) {
pr_err("get() with no identifier\n");
@@ -1245,6 +1245,15 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
if (rdev)
goto found;
+ /*
+ * If we have return value from dev_lookup fail, we do not expect to
+ * succeed, so, quit with appropriate error value
+ */
+ if (ret) {
+ regulator = ERR_PTR(ret);
+ goto out;
+ }
+
if (board_wants_dummy_regulator) {
rdev = dummy_regulator_rdev;
goto found;
--
1.7.9.5
next prev parent reply other threads:[~2013-04-16 21:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-05 4:21 [PATCH 0/2] cpufreq/regulator: Handle regulators that defer probe with device tree bindings Nishanth Menon
2013-04-05 4:21 ` [PATCH 1/2] regulator: core: return err value for regulator_get if there is no DT binding Nishanth Menon
2013-04-05 10:17 ` Mark Brown
2013-04-16 21:45 ` Nishanth Menon [this message]
2013-04-05 4:21 ` [PATCH 2/2] cpufreq: cpufreq-cpu0: defer probe when regulator is not ready Nishanth Menon
2013-04-05 5:13 ` [PATCH 0/2] cpufreq/regulator: Handle regulators that defer probe with device tree bindings Viresh Kumar
2013-04-05 6:13 ` Shawn Guo
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=1366148717-12586-1-git-send-email-nm@ti.com \
--to=nm@ti.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=cpufreq@vger.kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=shawn.guo@linaro.org \
--cc=viresh.kumar@linaro.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
all inboxes | Powered by JetHome®