From: Marco Felsch <m.felsch@pengutronix.de>
To: zhang.chunyan@linaro.org, dianders@chromium.org,
lgirdwood@gmail.com, broonie@kernel.org,
ckeepax@opensource.cirrus.com
Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de
Subject: [PATCH 3/3] regulator: core: make regulator_register() EPROBE_DEFER aware
Date: Tue, 17 Sep 2019 17:40:21 +0200 [thread overview]
Message-ID: <20190917154021.14693-4-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20190917154021.14693-1-m.felsch@pengutronix.de>
Sometimes it can happen that the regulator_of_get_init_data() can't
retrieve the config due to a not probed device the regulator depends on.
Fix that by checking the return value of of_parse_cb() and return
EPROBE_DEFER in such cases.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
drivers/regulator/core.c | 13 +++++++++++++
drivers/regulator/of_regulator.c | 19 ++++++++++++++-----
2 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index f9444f509440..e8e145c2a5df 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -5047,6 +5047,19 @@ regulator_register(const struct regulator_desc *regulator_desc,
init_data = regulator_of_get_init_data(dev, regulator_desc, config,
&rdev->dev.of_node);
+
+ /*
+ * Sometimes not all resources are probed already so we need to take
+ * that into account. This happens most the time if the ena_gpiod comes
+ * from a gpio extender or something else.
+ */
+ if (PTR_ERR(init_data) == -EPROBE_DEFER) {
+ kfree(config);
+ kfree(rdev);
+ ret = -EPROBE_DEFER;
+ goto rinse;
+ }
+
/*
* We need to keep track of any GPIO descriptor coming from the
* device tree until we have handled it over to the core. If the
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 38dd06fbab38..ef7198b76e50 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -445,11 +445,20 @@ struct regulator_init_data *regulator_of_get_init_data(struct device *dev,
goto error;
}
- if (desc->of_parse_cb && desc->of_parse_cb(child, desc, config)) {
- dev_err(dev,
- "driver callback failed to parse DT for regulator %pOFn\n",
- child);
- goto error;
+ if (desc->of_parse_cb) {
+ int ret;
+
+ ret = desc->of_parse_cb(child, desc, config);
+ if (ret) {
+ if (ret == -EPROBE_DEFER) {
+ of_node_put(child);
+ return ERR_PTR(-EPROBE_DEFER);
+ }
+ dev_err(dev,
+ "driver callback failed to parse DT for regulator %pOFn\n",
+ child);
+ goto error;
+ }
}
*node = child;
--
2.20.1
next prev parent reply other threads:[~2019-09-17 15:40 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-17 15:40 [PATCH 0/3] Regulator core fixes Marco Felsch
2019-09-17 15:40 ` [PATCH 1/3] regulator: core: fix boot-on regulators use_count usage Marco Felsch
2019-09-23 18:02 ` Doug Anderson
2019-09-23 18:14 ` Mark Brown
2019-09-23 18:36 ` Doug Anderson
2019-09-23 18:49 ` Mark Brown
2019-09-23 22:40 ` Doug Anderson
2019-09-24 18:27 ` Mark Brown
2019-09-26 19:44 ` Doug Anderson
2019-09-27 8:47 ` Marco Felsch
2019-10-01 19:57 ` Doug Anderson
2019-10-04 6:34 ` Matti Vaittinen
2019-10-04 11:32 ` Mark Brown
2019-10-04 12:03 ` Vaittinen, Matti
2019-10-04 15:01 ` Mark Brown
2019-10-07 9:34 ` Marco Felsch
2019-10-07 18:29 ` Mark Brown
2019-10-08 6:03 ` Marco Felsch
2019-10-08 12:51 ` Mark Brown
2019-10-08 14:56 ` Marco Felsch
2019-10-08 15:42 ` Mark Brown
2019-10-08 16:16 ` Marco Felsch
2019-10-08 16:23 ` Mark Brown
2019-10-08 20:16 ` Marco Felsch
2019-10-09 9:54 ` Mark Brown
2019-09-17 15:40 ` [PATCH 2/3] regulator: of: fix suspend-min/max-voltage parsing Marco Felsch
2019-09-17 16:02 ` Applied "regulator: of: fix suspend-min/max-voltage parsing" to the regulator tree Mark Brown
2019-09-17 15:40 ` Marco Felsch [this message]
2019-09-17 16:02 ` Applied "regulator: core: make regulator_register() EPROBE_DEFER aware" " Mark Brown
2019-09-18 0:57 ` [PATCH 3/3] regulator: core: make regulator_register() EPROBE_DEFER aware Dmitry Torokhov
2019-09-18 8:18 ` Marco Felsch
2019-09-18 15:53 ` Dmitry Torokhov
2019-09-18 16:06 ` Marco Felsch
2019-09-18 16:08 ` Mark Brown
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=20190917154021.14693-4-m.felsch@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.cirrus.com \
--cc=dianders@chromium.org \
--cc=kernel@pengutronix.de \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=zhang.chunyan@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;
as well as URLs for NNTP newsgroup(s).