thermal/drivers/exynos: Simplify regulator (de)initialization

We rewrite the initialization to enable the regulator as part of devm,
which allows us to not handle the struct instance manually.

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Mateusz Majewski <m.majewski2@samsung.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link:
https://lore.kernel.org/r/20231201095625.301884-6-m.majewski2@samsung.com

diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 8bcad8a70dc5ce6ab907a16d00df8786fb312f94..3bdcbab7466f5916c896f15f5eb98070fc09cb91 100644 (file)
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -157,7 +157,6 @@ enum soc_type {
  * @reference_voltage: reference voltage of amplifier
  *     in the positive-TC generator block
  *     0 < reference_voltage <= 31
- * @regulator: pointer to the TMU regulator structure.
  * @tzd: pointer to thermal_zone_device structure
  * @ntrip: number of supported trip points.
  * @enabled: current status of TMU device
@@ -183,7 +182,6 @@ struct exynos_tmu_data {
        u16 temp_error1, temp_error2;
        u8 gain;
        u8 reference_voltage;
-       struct regulator *regulator;
        struct thermal_zone_device *tzd;
        unsigned int ntrip;
        bool enabled;
@@ -994,50 +992,40 @@ static int exynos_tmu_probe(struct platform_device *pdev)
         * TODO: Add regulator as an SOC feature, so that regulator enable
         * is a compulsory call.
         */
-       data->regulator = devm_regulator_get_optional(&pdev->dev, "vtmu");
-       if (!IS_ERR(data->regulator)) {
-               ret = regulator_enable(data->regulator);
-               if (ret) {
-                       dev_err(&pdev->dev, "failed to enable vtmu\n");
-                       return ret;
-               }
-       } else {
-               ret = PTR_ERR(data->regulator);
-               switch (ret) {
-               case -ENODEV:
-                       break;
-               case -EPROBE_DEFER:
-                       return -EPROBE_DEFER;
-               default:
-                       dev_err(&pdev->dev, "Failed to get regulator: %d\n",
-                               ret);
-                       return ret;
-               }
+       ret = devm_regulator_get_enable_optional(&pdev->dev, "vtmu");
+       switch (ret) {
+       case 0:
+       case -ENODEV:
+               break;
+       case -EPROBE_DEFER:
+               return -EPROBE_DEFER;
+       default:
+               dev_err(&pdev->dev, "Failed to get enabled regulator: %d\n",
+                       ret);
+               return ret;
        }
 
        ret = exynos_map_dt_data(pdev);
        if (ret)
-               goto err_sensor;
+               return ret;
 
        data->clk = devm_clk_get(&pdev->dev, "tmu_apbif");
        if (IS_ERR(data->clk)) {
                dev_err(&pdev->dev, "Failed to get clock\n");
-               ret = PTR_ERR(data->clk);
-               goto err_sensor;
+               return PTR_ERR(data->clk);
        }
 
        data->clk_sec = devm_clk_get(&pdev->dev, "tmu_triminfo_apbif");
        if (IS_ERR(data->clk_sec)) {
                if (data->soc == SOC_ARCH_EXYNOS5420_TRIMINFO) {
                        dev_err(&pdev->dev, "Failed to get triminfo clock\n");
-                       ret = PTR_ERR(data->clk_sec);
-                       goto err_sensor;
+                       return PTR_ERR(data->clk_sec);
                }
        } else {
                ret = clk_prepare(data->clk_sec);
                if (ret) {
                        dev_err(&pdev->dev, "Failed to get clock\n");
-                       goto err_sensor;
+                       return ret;
                }
        }
 
@@ -1107,10 +1095,6 @@ err_clk:
 err_clk_sec:
        if (!IS_ERR(data->clk_sec))
                clk_unprepare(data->clk_sec);
-err_sensor:
-       if (!IS_ERR(data->regulator))
-               regulator_disable(data->regulator);
-
        return ret;
 }
 
@@ -1124,9 +1108,6 @@ static void exynos_tmu_remove(struct platform_device *pdev)
        clk_unprepare(data->clk);
        if (!IS_ERR(data->clk_sec))
                clk_unprepare(data->clk_sec);
-
-       if (!IS_ERR(data->regulator))
-               regulator_disable(data->regulator);
 }
 
 #ifdef CONFIG_PM_SLEEP