From: Linus Walleij <linus.walleij@linaro.org>
To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Charles Keepax <ckeepax@opensource.cirrus.com>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Linus Walleij <linus.walleij@linaro.org>
Subject: [PATCH 06/13 v2] regulator: max8973: Let core handle GPIO descriptor
Date: Sat, 1 Dec 2018 16:41:44 +0100 [thread overview]
Message-ID: <20181201154151.14890-7-linus.walleij@linaro.org> (raw)
In-Reply-To: <20181201154151.14890-1-linus.walleij@linaro.org>
Use the gpiod_get() rather than the devm_* version so that the
regulator core can handle the lifecycle of these descriptors.
Fixes: e7d2be696faa ("regulator: max8973: Pass descriptor instead of GPIO number")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v1->v2:
- Drop the gpiod_put() on the errorpath after devm_regulator_register()
as this will be handled by the regulator core.
- Fix the second case of devm_gpiod_get()
- Put a comment in the code so maintainers knows not to
use managed resources (devm*)
---
drivers/regulator/max8973-regulator.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
index e7a58b509032..ef8f4789a517 100644
--- a/drivers/regulator/max8973-regulator.c
+++ b/drivers/regulator/max8973-regulator.c
@@ -632,7 +632,7 @@ static int max8973_probe(struct i2c_client *client,
struct max8973_chip *max;
bool pdata_from_dt = false;
unsigned int chip_id;
- struct gpio_desc *gpiod;
+ struct gpio_desc *gpiod = NULL;
enum gpiod_flags gflags;
int ret;
@@ -759,9 +759,13 @@ static int max8973_probe(struct i2c_client *client,
else
gflags = GPIOD_OUT_LOW;
gflags |= GPIOD_FLAGS_BIT_NONEXCLUSIVE;
- gpiod = devm_gpiod_get_optional(&client->dev,
- "maxim,enable",
- gflags);
+ /*
+ * Do not use devm* here: the regulator core takes over the
+ * lifecycle management of the GPIO descriptor.
+ */
+ gpiod = gpiod_get_optional(&client->dev,
+ "maxim,enable",
+ gflags);
if (IS_ERR(gpiod))
return PTR_ERR(gpiod);
if (gpiod) {
@@ -775,10 +779,13 @@ static int max8973_probe(struct i2c_client *client,
/*
* We do not let the core switch this regulator on/off,
* we just leave it on.
+ *
+ * Do not use devm* here: the regulator core takes over the
+ * lifecycle management of the GPIO descriptor.
*/
- gpiod = devm_gpiod_get_optional(&client->dev,
- "maxim,enable",
- GPIOD_OUT_HIGH);
+ gpiod = gpiod_get_optional(&client->dev,
+ "maxim,enable",
+ GPIOD_OUT_HIGH);
if (IS_ERR(gpiod))
return PTR_ERR(gpiod);
if (gpiod)
@@ -798,6 +805,8 @@ static int max8973_probe(struct i2c_client *client,
ret = max8973_init_dcdc(max, pdata);
if (ret < 0) {
+ if (gpiod)
+ gpiod_put(gpiod);
dev_err(max->dev, "Max8973 Init failed, err = %d\n", ret);
return ret;
}
--
2.19.1
next prev parent reply other threads:[~2018-12-01 15:53 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20181201154428epcas4p3a1a5c9c576027b1c56f8dd1510b32187@epcas4p3.samsung.com>
2018-12-01 15:41 ` [PATCH 00/13 v2] Regulator ena_gpiod fixups Linus Walleij
2018-12-01 15:41 ` [PATCH 01/13 v2] regulator: core: Track dangling GPIO descriptors Linus Walleij
2018-12-01 15:41 ` [PATCH 02/13 v2] regulator: fixed: Let core handle GPIO descriptor Linus Walleij
2018-12-01 15:41 ` [PATCH 03/13 v2] regulator: lm363x: " Linus Walleij
2018-12-01 15:41 ` [PATCH 04/13 v2] regulator: lp8788-ldo: " Linus Walleij
2018-12-01 15:41 ` [PATCH 05/13 v2] regulator: max8952: " Linus Walleij
2018-12-01 15:41 ` Linus Walleij [this message]
2018-12-05 13:08 ` [PATCH 06/13 v2] regulator: max8973: " Charles Keepax
2018-12-01 15:41 ` [PATCH 07/13 v2] gpio: Export gpiod_get_from_of_node() Linus Walleij
2018-12-01 15:41 ` [PATCH 08/13 v2] regulator: max77686: Let core handle GPIO descriptor Linus Walleij
2018-12-01 15:41 ` [PATCH 09/13 v2] gpio: Add devm_gpiod_unhinge() Linus Walleij
2018-12-02 17:02 ` Bartosz Golaszewski
2018-12-01 15:41 ` [PATCH 10/13 v2] regulator: da9211: Hand over GPIO to regulator core Linus Walleij
2018-12-01 15:41 ` [PATCH 11/13 v2] regulator: s5m8767: " Linus Walleij
2018-12-01 15:41 ` [PATCH 12/13 v2] regulator: tps65090: " Linus Walleij
2018-12-01 15:41 ` [PATCH 13/13 v2] regulator: s2mps11: " Linus Walleij
2018-12-03 14:35 ` [PATCH 00/13 v2] Regulator ena_gpiod fixups Marek Szyprowski
2018-12-04 9:31 ` Linus Walleij
2018-12-04 10:33 ` Marek Szyprowski
2018-12-04 12:44 ` Linus Walleij
2018-12-05 14:30 ` Marek Szyprowski
2018-12-05 14:32 ` Linus Walleij
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=20181201154151.14890-7-linus.walleij@linaro.org \
--to=linus.walleij@linaro.org \
--cc=bgolaszewski@baylibre.com \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.cirrus.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
/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).