summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2018-12-06 07:43:50 -0500
committerMark Brown <broonie@kernel.org>2018-12-10 20:04:56 -0500
commit870311e52bbf53838df937a5099ec92a657c1db5 (patch)
treebccd512f6409421c819f6f83f8e7d66b1c16ee2e
parent1f5163fcf1523e2890d3e8909daed777661765ab (diff)
regulator: tps65090: Hand over GPIO to regulator core
The GPIO descriptors used by the TPS65090 driver are retrieved during probe() and it is really helpful to have those under devres management because of all the errorpaths in the intialization. Using the new dev_gpiod_unhinge() call we can remove the devres management of the descriptor right before handing it over to the regulators core. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/regulator/tps65090-regulator.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c
index db714d5edafc..0614551796a1 100644
--- a/drivers/regulator/tps65090-regulator.c
+++ b/drivers/regulator/tps65090-regulator.c
@@ -480,6 +480,12 @@ static int tps65090_regulator_probe(struct platform_device *pdev)
480 else 480 else
481 config.of_node = NULL; 481 config.of_node = NULL;
482 482
483 /*
484 * Hand the GPIO descriptor management over to the regulator
485 * core, remove it from devres management.
486 */
487 if (config.ena_gpiod)
488 devm_gpiod_unhinge(&pdev->dev, config.ena_gpiod);
483 rdev = devm_regulator_register(&pdev->dev, ri->desc, &config); 489 rdev = devm_regulator_register(&pdev->dev, ri->desc, &config);
484 if (IS_ERR(rdev)) { 490 if (IS_ERR(rdev)) {
485 dev_err(&pdev->dev, "failed to register regulator %s\n", 491 dev_err(&pdev->dev, "failed to register regulator %s\n",