From: Mateusz Majewski <m.majewski2@samsung.com> To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Cc: Mateusz Majewski <m.majewski2@samsung.com>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Alim Akhtar <alim.akhtar@samsung.com>, Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>, "Rafael J. Wysocki" <rafael@kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Amit Kucheria <amitk@kernel.org>, Zhang Rui <rui.zhang@intel.com>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Marek Szyprowski <m.szyprowski@samsung.com> Subject: [PATCH 05/11] thermal: exynos: simplify sclk (de)initialization Date: Tue, 29 Aug 2023 11:18:43 +0200 [thread overview] Message-ID: <20230829091853.626011-6-m.majewski2@samsung.com> (raw) In-Reply-To: <20230829091853.626011-1-m.majewski2@samsung.com> There's no need to enable the clock separately, and this also allows us to delegate the deinitialization to devm entirely. Signed-off-by: Mateusz Majewski <m.majewski2@samsung.com> --- drivers/thermal/samsung/exynos_tmu.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 2c5501704911..49e9157c3dc7 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -1027,17 +1027,11 @@ static int exynos_tmu_probe(struct platform_device *pdev) switch (data->soc) { case SOC_ARCH_EXYNOS5433: case SOC_ARCH_EXYNOS7: - data->sclk = devm_clk_get(&pdev->dev, "tmu_sclk"); + data->sclk = devm_clk_get_enabled(&pdev->dev, "tmu_sclk"); if (IS_ERR(data->sclk)) { dev_err(&pdev->dev, "Failed to get sclk\n"); ret = PTR_ERR(data->sclk); goto err_clk_sec; - } else { - ret = clk_prepare_enable(data->sclk); - if (ret) { - dev_err(&pdev->dev, "Failed to enable sclk\n"); - goto err_clk_sec; - } } break; default: @@ -1055,13 +1049,13 @@ static int exynos_tmu_probe(struct platform_device *pdev) if (ret != -EPROBE_DEFER) dev_err(&pdev->dev, "Failed to register sensor: %d\n", ret); - goto err_sclk; + goto err_clk_sec; } ret = exynos_tmu_initialize(pdev); if (ret) { dev_err(&pdev->dev, "Failed to initialize TMU\n"); - goto err_sclk; + goto err_clk_sec; } ret = devm_request_threaded_irq( @@ -1070,14 +1064,12 @@ static int exynos_tmu_probe(struct platform_device *pdev) dev_name(&pdev->dev), data); if (ret) { dev_err(&pdev->dev, "Failed to request irq: %d\n", data->irq); - goto err_sclk; + goto err_clk_sec; } exynos_tmu_control(pdev, true); return 0; -err_sclk: - clk_disable_unprepare(data->sclk); err_clk_sec: if (!IS_ERR(data->clk_sec)) clk_unprepare(data->clk_sec); @@ -1094,7 +1086,6 @@ static int exynos_tmu_remove(struct platform_device *pdev) exynos_tmu_control(pdev, false); - clk_disable_unprepare(data->sclk); if (!IS_ERR(data->clk_sec)) clk_unprepare(data->clk_sec); -- 2.41.0
WARNING: multiple messages have this Message-ID (diff)
From: Mateusz Majewski <m.majewski2@samsung.com> To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Cc: Mateusz Majewski <m.majewski2@samsung.com>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Alim Akhtar <alim.akhtar@samsung.com>, Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>, "Rafael J. Wysocki" <rafael@kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Amit Kucheria <amitk@kernel.org>, Zhang Rui <rui.zhang@intel.com>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Marek Szyprowski <m.szyprowski@samsung.com> Subject: [PATCH 05/11] thermal: exynos: simplify sclk (de)initialization Date: Tue, 29 Aug 2023 11:18:43 +0200 [thread overview] Message-ID: <20230829091853.626011-6-m.majewski2@samsung.com> (raw) In-Reply-To: <20230829091853.626011-1-m.majewski2@samsung.com> There's no need to enable the clock separately, and this also allows us to delegate the deinitialization to devm entirely. Signed-off-by: Mateusz Majewski <m.majewski2@samsung.com> --- drivers/thermal/samsung/exynos_tmu.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 2c5501704911..49e9157c3dc7 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -1027,17 +1027,11 @@ static int exynos_tmu_probe(struct platform_device *pdev) switch (data->soc) { case SOC_ARCH_EXYNOS5433: case SOC_ARCH_EXYNOS7: - data->sclk = devm_clk_get(&pdev->dev, "tmu_sclk"); + data->sclk = devm_clk_get_enabled(&pdev->dev, "tmu_sclk"); if (IS_ERR(data->sclk)) { dev_err(&pdev->dev, "Failed to get sclk\n"); ret = PTR_ERR(data->sclk); goto err_clk_sec; - } else { - ret = clk_prepare_enable(data->sclk); - if (ret) { - dev_err(&pdev->dev, "Failed to enable sclk\n"); - goto err_clk_sec; - } } break; default: @@ -1055,13 +1049,13 @@ static int exynos_tmu_probe(struct platform_device *pdev) if (ret != -EPROBE_DEFER) dev_err(&pdev->dev, "Failed to register sensor: %d\n", ret); - goto err_sclk; + goto err_clk_sec; } ret = exynos_tmu_initialize(pdev); if (ret) { dev_err(&pdev->dev, "Failed to initialize TMU\n"); - goto err_sclk; + goto err_clk_sec; } ret = devm_request_threaded_irq( @@ -1070,14 +1064,12 @@ static int exynos_tmu_probe(struct platform_device *pdev) dev_name(&pdev->dev), data); if (ret) { dev_err(&pdev->dev, "Failed to request irq: %d\n", data->irq); - goto err_sclk; + goto err_clk_sec; } exynos_tmu_control(pdev, true); return 0; -err_sclk: - clk_disable_unprepare(data->sclk); err_clk_sec: if (!IS_ERR(data->clk_sec)) clk_unprepare(data->clk_sec); @@ -1094,7 +1086,6 @@ static int exynos_tmu_remove(struct platform_device *pdev) exynos_tmu_control(pdev, false); - clk_disable_unprepare(data->sclk); if (!IS_ERR(data->clk_sec)) clk_unprepare(data->clk_sec); -- 2.41.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-08-29 9:25 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <CGME20230829092403eucas1p17048226c987315610cf49c7c6eab2148@eucas1p1.samsung.com> 2023-08-29 9:18 ` [PATCH 00/11] Improve Exynos thermal driver Mateusz Majewski 2023-08-29 9:18 ` Mateusz Majewski [not found] ` <CGME20230829092405eucas1p14543d527d81e8714594ebb999ab5fc02@eucas1p1.samsung.com> 2023-08-29 9:18 ` [PATCH 01/11] ARM: dts: exynos: enable polling in Exynos 4210 Mateusz Majewski 2023-08-29 9:18 ` Mateusz Majewski 2023-08-29 9:26 ` Krzysztof Kozlowski 2023-08-29 9:26 ` Krzysztof Kozlowski [not found] ` <CGME20230829092408eucas1p24901bbd192db03b69d774f2c5936f5b3@eucas1p2.samsung.com> 2023-08-29 9:18 ` [PATCH 02/11] thermal: exynos: drop id field Mateusz Majewski 2023-08-29 9:18 ` Mateusz Majewski 2023-08-29 9:29 ` Krzysztof Kozlowski 2023-08-29 9:29 ` Krzysztof Kozlowski [not found] ` <CGME20230829092410eucas1p243a88662e8e64f0c406685931d9a80a3@eucas1p2.samsung.com> 2023-08-29 9:18 ` [PATCH 03/11] thermal: exynos: switch from workqueue-driven interrupt handling to threaded interrupts Mateusz Majewski 2023-08-29 9:18 ` Mateusz Majewski 2023-08-29 9:51 ` Krzysztof Kozlowski 2023-08-29 9:51 ` Krzysztof Kozlowski [not found] ` <CGME20230829092412eucas1p2b79a6f90b9077a3a5486845b7e68bbc6@eucas1p2.samsung.com> 2023-08-29 9:18 ` [PATCH 04/11] thermal: exynos: remove fine-grained clk management Mateusz Majewski 2023-08-29 9:18 ` Mateusz Majewski 2023-08-29 9:56 ` Krzysztof Kozlowski 2023-08-29 9:56 ` Krzysztof Kozlowski 2023-09-01 8:40 ` Marek Szyprowski 2023-09-01 8:40 ` Marek Szyprowski 2023-09-11 16:05 ` Krzysztof Kozlowski 2023-09-11 16:05 ` Krzysztof Kozlowski [not found] ` <CGME20230829092415eucas1p1cb4d56f908e7851297b2c4ed59984b2f@eucas1p1.samsung.com> 2023-08-29 9:18 ` Mateusz Majewski [this message] 2023-08-29 9:18 ` [PATCH 05/11] thermal: exynos: simplify sclk (de)initialization Mateusz Majewski [not found] ` <CGME20230829092417eucas1p187216bed157d5fb8472780688cf746d2@eucas1p1.samsung.com> 2023-08-29 9:18 ` [PATCH 06/11] thermal: exynos: simplify regulator (de)initialization Mateusz Majewski 2023-08-29 9:18 ` Mateusz Majewski [not found] ` <CGME20230829092419eucas1p275687d1c34087e8bad4b3194ad4b8973@eucas1p2.samsung.com> 2023-08-29 9:18 ` [PATCH 07/11] thermal: exynos: simplify clk_sec (de)initialization Mateusz Majewski 2023-08-29 9:18 ` Mateusz Majewski [not found] ` <CGME20230829092421eucas1p1970c3fb42ca622129bf92511893500b1@eucas1p1.samsung.com> 2023-08-29 9:18 ` [PATCH 08/11] thermal: exynos: stop using the threshold mechanism on Exynos 4210 Mateusz Majewski 2023-08-29 9:18 ` Mateusz Majewski 2023-08-29 10:02 ` Krzysztof Kozlowski 2023-08-29 10:02 ` Krzysztof Kozlowski [not found] ` <CGME20230829092423eucas1p1fc13c188d99482b195e115fd19a1391d@eucas1p1.samsung.com> 2023-08-29 9:18 ` [PATCH 09/11] thermal: exynos: split initialization of TMU and the thermal zone Mateusz Majewski 2023-08-29 9:18 ` Mateusz Majewski [not found] ` <CGME20230829092424eucas1p269935c8781c84b4c2a83d652f3370bf9@eucas1p2.samsung.com> 2023-08-29 9:18 ` [PATCH 10/11] thermal: exynos: use set_trips Mateusz Majewski 2023-08-29 9:18 ` Mateusz Majewski 2023-08-29 11:00 ` kernel test robot 2023-08-29 11:00 ` kernel test robot [not found] ` <CGME20230829092426eucas1p222c2a1c2013f4eb9ee739f03761e5236@eucas1p2.samsung.com> 2023-08-29 9:18 ` [PATCH 11/11] ARM: dts: exynos: disable polling in Odroid XU3-related devices Mateusz Majewski 2023-08-29 9:18 ` Mateusz Majewski 2023-08-29 10:07 ` Krzysztof Kozlowski 2023-08-29 10:07 ` Krzysztof Kozlowski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230829091853.626011-6-m.majewski2@samsung.com \ --to=m.majewski2@samsung.com \ --cc=alim.akhtar@samsung.com \ --cc=amitk@kernel.org \ --cc=broonie@kernel.org \ --cc=bzolnier@gmail.com \ --cc=conor+dt@kernel.org \ --cc=daniel.lezcano@linaro.org \ --cc=devicetree@vger.kernel.org \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=lgirdwood@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=rafael@kernel.org \ --cc=robh+dt@kernel.org \ --cc=rui.zhang@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.