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>

diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 63e66f485cc084ad3721c75c14afaa91af3974b7..ee4a23ab06639a297bacfe0c2fc0877a5ee19cb8 100644 (file)
--- 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,
                                                &regulators[i], &config);
                if (IS_ERR(regulator)) {