[PATCH v7 2/7] thermal/drivers/exynos: Use devm_clk_get_enabled() helpers
From: Anand Moon <hidden>
Date: 2025-08-13 13:10:34
Also in:
linux-pm, linux-samsung-soc, lkml, llvm
Subsystem:
samsung thermal driver, the rest, thermal · Maintainers:
Bartlomiej Zolnierkiewicz, Krzysztof Kozlowski, Linus Torvalds, Rafael J. Wysocki, Daniel Lezcano
Use devm_clk_get_enabled() helper instead of calling devm_clk_get() and then clk_prepare_enable(). It simplifies the error handling and makes the code more compact. Suggested-by: Daniel Lezcano <redacted> Signed-off-by: Anand Moon <redacted> --- v7: None v6: New patch as per Daniel request. --- drivers/thermal/samsung/exynos_tmu.c | 77 ++++++++-------------------- 1 file changed, 20 insertions(+), 57 deletions(-)
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 04517d52afbd..aa0726b33c84 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c@@ -1036,65 +1036,41 @@ static int exynos_tmu_probe(struct platform_device *pdev) if (ret) return ret; - data->clk = devm_clk_get(dev, "tmu_apbif"); + data->clk = devm_clk_get_enabled(dev, "tmu_apbif"); if (IS_ERR(data->clk)) - return dev_err_probe(dev, PTR_ERR(data->clk), "Failed to get clock\n"); - - ret = clk_prepare(data->clk); - if (ret) { - dev_err(dev, "Failed to get clock\n"); - return ret; - } - - switch (data->soc) { - case SOC_ARCH_EXYNOS5420_TRIMINFO: - data->clk_sec = devm_clk_get(dev, "tmu_triminfo_apbif"); - if (IS_ERR(data->clk_sec)) { - ret = dev_err_probe(dev, PTR_ERR(data->clk_sec), - "Failed to get clk_sec clock\n"); - goto err_clk; - } - ret = clk_prepare(data->clk_sec); - if (ret) { - dev_err(dev, "Failed to prepare clk_sec clock\n"); - goto err_clk_sec; - } - break; - case SOC_ARCH_EXYNOS5433: - case SOC_ARCH_EXYNOS7: - data->sclk = devm_clk_get(dev, "tmu_sclk"); - if (IS_ERR(data->sclk)) { - ret = dev_err_probe(dev, PTR_ERR(data->sclk), "Failed to get sclk\n"); - goto err_clk; - } else { - ret = clk_prepare_enable(data->sclk); - if (ret) { - dev_err(dev, "Failed to enable sclk\n"); - goto err_clk; - } - } - break; - default: - break; + return dev_err_probe(dev, PTR_ERR(data->clk), + "Failed to get clock\n"); + + if (data->soc == SOC_ARCH_EXYNOS5420_TRIMINFO) { + data->clk_sec = devm_clk_get_enabled(dev, "tmu_triminfo_apbif"); + if (IS_ERR(data->clk_sec)) + return dev_err_probe(dev, PTR_ERR(data->clk_sec), + "Failed to get clk_sec clock\n"); + } else if (data->soc == SOC_ARCH_EXYNOS5433 || + data->soc == SOC_ARCH_EXYNOS7) { + data->sclk = devm_clk_get_enabled(dev, "tmu_sclk"); + if (IS_ERR(data->sclk)) + return dev_err_probe(dev, PTR_ERR(data->sclk), + "Failed to get sclk\n"); } ret = exynos_tmu_initialize(pdev); if (ret) { dev_err(dev, "Failed to initialize TMU\n"); - goto err_sclk; + return ret; } data->tzd = devm_thermal_of_zone_register(dev, 0, data, &exynos_sensor_ops); if (IS_ERR(data->tzd)) { - ret = dev_err_probe(dev, PTR_ERR(data->tzd), "Failed to register sensor\n"); - goto err_sclk; + return dev_err_probe(dev, PTR_ERR(data->tzd), + "Failed to register sensor\n"); } ret = exynos_thermal_zone_configure(pdev); if (ret) { dev_err(dev, "Failed to configure the thermal zone\n"); - goto err_sclk; + return ret; } ret = devm_request_threaded_irq(dev, data->irq, NULL,
@@ -1104,30 +1080,17 @@ static int exynos_tmu_probe(struct platform_device *pdev) dev_name(dev), data); if (ret) { dev_err(dev, "Failed to request irq: %d\n", data->irq); - goto err_sclk; + return ret; } exynos_tmu_control(pdev, true); - return 0; -err_sclk: - clk_disable_unprepare(data->sclk); -err_clk_sec: - clk_unprepare(data->clk_sec); -err_clk: - clk_unprepare(data->clk); return ret; } static void exynos_tmu_remove(struct platform_device *pdev) { - struct exynos_tmu_data *data = platform_get_drvdata(pdev); - exynos_tmu_control(pdev, false); - - clk_disable_unprepare(data->sclk); - clk_unprepare(data->clk); - clk_unprepare(data->clk_sec); } #ifdef CONFIG_PM_SLEEP
--
2.50.1