From: Kang Chen <void0red@hust.edu.cn>
To: daniel.lezcano@linaro.org
Cc: amitk@kernel.org, angelogioacchino.delregno@collabora.com,
bchihi@baylibre.com, daniel@makrotopia.org, dzm91@hust.edu.cn,
error27@gmail.com, henry.yen@mediatek.com,
hust-os-kernel-patches@googlegroups.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org,
linux-pm@vger.kernel.org, matthias.bgg@gmail.com,
rafael@kernel.org, rdunlap@infradead.org, rui.zhang@intel.com,
void0red@gmail.com, void0red@hust.edu.cn
Subject: [PATCH v2 2/2] thermal: mediatek: change clk_prepare_enable to devm_clk_get_enabled in mtk_thermal_probe
Date: Tue, 4 Apr 2023 00:46:10 +0800 [thread overview]
Message-ID: <20230403164610.3608082-2-void0red@hust.edu.cn> (raw)
In-Reply-To: <20230403164610.3608082-1-void0red@hust.edu.cn>
use devm_clk_get_enabled to do automatic resource management.
Signed-off-by: Kang Chen <void0red@hust.edu.cn>
---
I'm not quite sure if this function should return 0 when
devm_thermal_add_hwmon_sysfs occurs error. So I keep it.
drivers/thermal/mediatek/auxadc_thermal.c | 25 ++++++++---------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/drivers/thermal/mediatek/auxadc_thermal.c b/drivers/thermal/mediatek/auxadc_thermal.c
index df5e2e354408..5baec2c08ebc 100644
--- a/drivers/thermal/mediatek/auxadc_thermal.c
+++ b/drivers/thermal/mediatek/auxadc_thermal.c
@@ -1178,16 +1178,16 @@ static int mtk_thermal_probe(struct platform_device *pdev)
if (ret)
return ret;
- ret = clk_prepare_enable(mt->clk_auxadc);
- if (ret) {
+ ret = devm_clk_get_enabled(&pdev->dev, mt->clk_auxadc);
+ if (IS_ERR(ret)) {
dev_err(&pdev->dev, "Can't enable auxadc clk: %d\n", ret);
- return ret;
+ return PTR_ERR(ret);
}
- ret = clk_prepare_enable(mt->clk_peri_therm);
- if (ret) {
+ ret = devm_clk_get_enabled(&pdev->dev, mt->clk_peri_therm);
+ if (IS_ERR(ret)) {
dev_err(&pdev->dev, "Can't enable peri clk: %d\n", ret);
- goto err_disable_clk_auxadc;
+ return PTR_ERR(ret);
}
if (mt->conf->version != MTK_THERMAL_V1) {
@@ -1211,23 +1211,14 @@ static int mtk_thermal_probe(struct platform_device *pdev)
tzdev = devm_thermal_of_zone_register(&pdev->dev, 0, mt,
&mtk_thermal_ops);
- if (IS_ERR(tzdev)) {
- ret = PTR_ERR(tzdev);
- goto err_disable_clk_peri_therm;
- }
+ if (IS_ERR(tzdev))
+ return PTR_ERR(tzdev);
ret = devm_thermal_add_hwmon_sysfs(tzdev);
if (ret)
dev_warn(&pdev->dev, "error in thermal_add_hwmon_sysfs");
return 0;
-
-err_disable_clk_peri_therm:
- clk_disable_unprepare(mt->clk_peri_therm);
-err_disable_clk_auxadc:
- clk_disable_unprepare(mt->clk_auxadc);
-
- return ret;
}
static int mtk_thermal_remove(struct platform_device *pdev)
--
2.34.1
next prev parent reply other threads:[~2023-04-03 16:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-03 10:38 [PATCH] drivers: thermal: mediatek: fix of_iomap leak in mtk_thermal_probe Kang Chen
2023-04-03 11:32 ` Daniel Lezcano
2023-04-03 16:46 ` [PATCH v2 1/2] thermal: mediatek: use devm_of_iomap to avoid resource " Kang Chen
2023-04-03 16:46 ` Kang Chen [this message]
2023-04-10 3:46 ` [PATCH v2 2/2] thermal: mediatek: change clk_prepare_enable to devm_clk_get_enabled " 陈康
2023-04-10 19:42 ` Daniel Lezcano
2023-04-11 6:35 ` [PATCH v3 1/2] thermal: mediatek: use devm_of_iomap to avoid resource leak " Kang Chen
2023-04-11 6:35 ` [PATCH v3 2/2] thermal: mediatek: change clk_prepare_enable to devm_clk_get_enabled " Kang Chen
2023-04-15 7:14 ` void0red
2023-04-17 9:52 ` Daniel Lezcano
[not found] ` <6108982E-A3DC-4B7E-829E-20BBAC9C503F@hust.edu.cn>
2023-04-17 10:43 ` Dan Carpenter
2023-04-17 12:55 ` [PATCH v4 1/2] thermal: mediatek: use devm_of_iomap to avoid resource leak " Kang Chen
2023-04-17 12:55 ` [PATCH v4 2/2] thermal: mediatek: change clk_prepare_enable to devm_clk_get_enabled " Kang Chen
2023-04-18 9:25 ` [PATCH v4 1/2] thermal: mediatek: use devm_of_iomap to avoid resource leak " AngeloGioacchino Del Regno
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=20230403164610.3608082-2-void0red@hust.edu.cn \
--to=void0red@hust.edu.cn \
--cc=amitk@kernel.org \
--cc=angelogioacchino.delregno@collabora.com \
--cc=bchihi@baylibre.com \
--cc=daniel.lezcano@linaro.org \
--cc=daniel@makrotopia.org \
--cc=dzm91@hust.edu.cn \
--cc=error27@gmail.com \
--cc=henry.yen@mediatek.com \
--cc=hust-os-kernel-patches@googlegroups.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=rafael@kernel.org \
--cc=rdunlap@infradead.org \
--cc=rui.zhang@intel.com \
--cc=void0red@gmail.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox