diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2018-12-06 13:43:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-11 01:05:00 +0000 |
| commit | 2b96edb570709d6ca2e06842941c4bdf04b55f47 (patch) | |
| tree | 8325988c6b0fc9e9b729cee157d093466e03a4f2 /drivers | |
| parent | 870311e52bbf53838df937a5099ec92a657c1db5 (diff) | |
| download | linux-2b96edb570709d6ca2e06842941c4bdf04b55f47.tar.gz | |
regulator: s2mps11: Hand over GPIO to regulator core
The GPIO descriptors used by the S2MPS11 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/s2mps11.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index 63e66f485cc0..ee4a23ab0663 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c @@ -1178,7 +1178,12 @@ common_reg: config.of_node = rdata[i].of_node; } config.ena_gpiod = s2mps11->ext_control_gpiod[i]; - + /* + * Hand the GPIO descriptor management over to the regulator + * core, remove it from devres management. + */ + if (config.ena_gpiod) + devm_gpiod_unhinge(&pdev->dev, config.ena_gpiod); regulator = devm_regulator_register(&pdev->dev, ®ulators[i], &config); if (IS_ERR(regulator)) { |