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 03/15 v4] regulator: lm363x: Let core handle GPIO descriptor
Date: Thu, 6 Dec 2018 13:43:39 +0100 [thread overview]
Message-ID: <20181206124351.10155-4-linus.walleij@linaro.org> (raw)
In-Reply-To: <20181206124351.10155-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: b2d751b7f69b ("regulator: lm363x: Pass descriptor instead of GPIO number")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v3->v4:
- Resending.
ChangeLog v2->v3:
- Resending.
ChangeLog v1->v2:
- Drop the gpiod_put() on the errorpath after devm_regulator_register()
as this will be handled by the regulator core.
- Put a comment in the code so maintainers knows not to
use managed resources (devm*)
---
drivers/regulator/lm363x-regulator.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/regulator/lm363x-regulator.c b/drivers/regulator/lm363x-regulator.c
index bbedb08d257b..8c0e8419c43f 100644
--- a/drivers/regulator/lm363x-regulator.c
+++ b/drivers/regulator/lm363x-regulator.c
@@ -224,13 +224,15 @@ static struct gpio_desc *lm363x_regulator_of_get_enable_gpio(struct device *dev,
/*
* Check LCM_EN1/2_GPIO is configured.
* Those pins are used for enabling VPOS/VNEG LDOs.
+ * Do not use devm* here: the regulator core takes over the
+ * lifecycle management of the GPIO descriptor.
*/
switch (id) {
case LM3632_LDO_POS:
- return devm_gpiod_get_index_optional(dev, "enable", 0,
+ return gpiod_get_index_optional(dev, "enable", 0,
GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE);
case LM3632_LDO_NEG:
- return devm_gpiod_get_index_optional(dev, "enable", 1,
+ return gpiod_get_index_optional(dev, "enable", 1,
GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE);
default:
return NULL;
@@ -263,6 +265,8 @@ static int lm363x_regulator_probe(struct platform_device *pdev)
LM3632_EXT_EN_MASK,
LM3632_EXT_EN_MASK);
if (ret) {
+ if (gpiod)
+ gpiod_put(gpiod);
dev_err(dev, "External pin err: %d\n", ret);
return ret;
}
--
2.19.2
next prev parent reply other threads:[~2018-12-06 12:44 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20181206124518epcas4p2fd2837b5bc5e0c806e93ce752599e264@epcas4p2.samsung.com>
2018-12-06 12:43 ` [PATCH 00/15 v4] Regulator ena_gpiod fixups Linus Walleij
2018-12-06 12:43 ` [PATCH 01/15 v4] regulator: core: Track dangling GPIO descriptors Linus Walleij
2018-12-06 12:43 ` [PATCH 02/15 v4] regulator: fixed: Let core handle GPIO descriptor Linus Walleij
2018-12-06 12:43 ` Linus Walleij [this message]
2018-12-06 12:43 ` [PATCH 04/15 v4] regulator: lp8788-ldo: " Linus Walleij
2018-12-06 12:43 ` [PATCH 05/15 v4] regulator: max8952: " Linus Walleij
2018-12-06 12:43 ` [PATCH 06/15 v4] gpio: Export gpiod_get_from_of_node() Linus Walleij
2018-12-06 12:43 ` [PATCH 07/15 v4] regulator: max77686: Let core handle GPIO descriptor Linus Walleij
2018-12-06 12:43 ` [PATCH 08/15 v4] gpio: Enable nonexclusive gpiods from DT nodes Linus Walleij
2018-12-06 12:43 ` [PATCH 09/15 v4] gpio: devres: Handle nonexclusive GPIOs Linus Walleij
2018-12-06 12:43 ` [PATCH 10/15 v4] gpio: Add devm_gpiod_unhinge() Linus Walleij
2018-12-06 12:43 ` [PATCH 11/15 v4] regulator: max8973: Let core handle GPIO descriptor Linus Walleij
2018-12-06 12:43 ` [PATCH 12/15 v4] regulator: da9211: Hand over GPIO to regulator core Linus Walleij
2018-12-06 12:43 ` [PATCH 13/15 v4] regulator: s5m8767: " Linus Walleij
2018-12-06 12:43 ` [PATCH 14/15 v4] regulator: tps65090: " Linus Walleij
2018-12-06 12:43 ` [PATCH 15/15 v4] regulator: s2mps11: " Linus Walleij
2018-12-06 13:27 ` [PATCH 00/15 v4] Regulator ena_gpiod fixups Marek Szyprowski
2018-12-06 13:49 ` Charles Keepax
2018-12-06 14:41 ` 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=20181206124351.10155-4-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).