thermal/drivers/tegra/soctherm: Use devm_add_action_or_reset() for clock disable

Replace the manual error handling paths disabling the clocks with
devm_add_action_or_reset(). This ensures the clocks are properly
disabled on probe failure and driver removal, while simplifying the
code by removing the explicit error paths.

Signed-off-by: Daniel Lezcano <daniel.lezcano@oss.qualcomm.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@kernel.org>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Link: https://patch.msgid.link/20260424160019.41710-1-daniel.lezcano@oss.qualcomm.com

diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/soctherm.c
index 5d26b52beaba7aee38cfc5f85cdc1cb43828f13d..40c3715e84c50edab98883bcc9507a2dc80f866e 100644 (file)
--- a/drivers/thermal/tegra/soctherm.c
+++ b/drivers/thermal/tegra/soctherm.c
@@ -1499,6 +1499,13 @@ static int soctherm_clk_enable(struct platform_device *pdev, bool enable)
        return 0;
 }
 
+static void soctherm_clk_disable(void *data)
+{
+       struct platform_device *pdev = data;
+
+       soctherm_clk_enable(pdev, false);
+}
+
 static int throt_get_cdev_max_state(struct thermal_cooling_device *cdev,
                                    unsigned long *max_state)
 {
@@ -2175,6 +2182,10 @@ static int tegra_soctherm_probe(struct platform_device *pdev)
        if (err)
                return err;
 
+       err = devm_add_action_or_reset(&pdev->dev, soctherm_clk_disable, pdev);
+       if (err)
+               return err;
+
        soctherm_thermtrips_parse(pdev);
 
        soctherm_init_hw_throt_cdev(pdev);
@@ -2184,10 +2195,8 @@ static int tegra_soctherm_probe(struct platform_device *pdev)
        for (i = 0; i < soc->num_ttgs; ++i) {
                struct tegra_thermctl_zone *zone =
                        devm_kzalloc(&pdev->dev, sizeof(*zone), GFP_KERNEL);
-               if (!zone) {
-                       err = -ENOMEM;
-                       goto disable_clocks;
-               }
+               if (!zone)
+                       return -ENOMEM;
 
                zone->reg = tegra->regs + soc->ttgs[i]->sensor_temp_offset;
                zone->dev = &pdev->dev;
@@ -2201,7 +2210,7 @@ static int tegra_soctherm_probe(struct platform_device *pdev)
                        err = PTR_ERR(z);
                        dev_err(&pdev->dev, "failed to register sensor: %d\n",
                                err);
-                       goto disable_clocks;
+                       return err;
                }
 
                zone->tz = z;
@@ -2210,7 +2219,7 @@ static int tegra_soctherm_probe(struct platform_device *pdev)
                /* Configure hw trip points */
                err = tegra_soctherm_set_hwtrips(&pdev->dev, soc->ttgs[i], z);
                if (err)
-                       goto disable_clocks;
+                       return err;
        }
 
        err = soctherm_interrupts_init(pdev, tegra);
@@ -2218,11 +2227,6 @@ static int tegra_soctherm_probe(struct platform_device *pdev)
        soctherm_debug_init(pdev);
 
        return 0;
-
-disable_clocks:
-       soctherm_clk_enable(pdev, false);
-
-       return err;
 }
 
 static void tegra_soctherm_remove(struct platform_device *pdev)
@@ -2230,8 +2234,6 @@ static void tegra_soctherm_remove(struct platform_device *pdev)
        struct tegra_soctherm *tegra = platform_get_drvdata(pdev);
 
        debugfs_remove_recursive(tegra->debugfs_dir);
-
-       soctherm_clk_enable(pdev, false);
 }
 
 static int __maybe_unused soctherm_suspend(struct device *dev)