regulator: s5m8767: Hand over GPIO to regulator core

The GPIO descriptors used by the S5M8767 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>

diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 654f65abcb5a0cf17d896297a504b09e16a9c79c..b581f01f3395762eec02ff5d0a70efda4ecdfe48 100644 (file)
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -956,10 +956,17 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
                config.regmap = iodev->regmap_pmic;
                config.of_node = pdata->regulators[i].reg_node;
                config.ena_gpiod = NULL;
-               if (pdata->regulators[i].ext_control_gpiod)
+               if (pdata->regulators[i].ext_control_gpiod) {
+                       /* Assigns config.ena_gpiod */
                        s5m8767_regulator_config_ext_control(s5m8767,
                                        &pdata->regulators[i], &config);
 
+                       /*
+                        * Hand the GPIO descriptor management over to the
+                        * regulator core, remove it from devres management.
+                        */
+                       devm_gpiod_unhinge(s5m8767->dev, config.ena_gpiod);
+               }
                rdev = devm_regulator_register(&pdev->dev, &regulators[id],
                                                  &config);
                if (IS_ERR(rdev)) {