mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
c36de2e73a
Backport almost 50 commits from upstream Linux to improve thermal drivers for MediaTek SoCs and add new LVTS driver for MT7988. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
From 2c380d07215e6fce3ac66cc5af059bc2c2a69f7a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ricardo=20Ca=C3=B1uelo?= <ricardo.canuelo@collabora.com>
|
|
Date: Thu, 25 May 2023 14:18:11 +0200
|
|
Subject: [PATCH 21/42] Revert "thermal/drivers/mediatek: Use devm_of_iomap to
|
|
avoid resource leak in mtk_thermal_probe"
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This reverts commit f05c7b7d9ea9477fcc388476c6f4ade8c66d2d26.
|
|
|
|
That change was causing a regression in the generic-adc-thermal-probed
|
|
bootrr test as reported in the kernelci-results list [1].
|
|
A proper rework will take longer, so revert it for now.
|
|
|
|
[1] https://groups.io/g/kernelci-results/message/42660
|
|
|
|
Fixes: f05c7b7d9ea9 ("thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe")
|
|
Signed-off-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com>
|
|
Suggested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
|
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
|
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
Link: https://lore.kernel.org/r/20230525121811.3360268-1-ricardo.canuelo@collabora.com
|
|
---
|
|
drivers/thermal/mediatek/auxadc_thermal.c | 14 ++------------
|
|
1 file changed, 2 insertions(+), 12 deletions(-)
|
|
|
|
--- a/drivers/thermal/mediatek/auxadc_thermal.c
|
|
+++ b/drivers/thermal/mediatek/auxadc_thermal.c
|
|
@@ -1222,12 +1222,7 @@ static int mtk_thermal_probe(struct plat
|
|
return -ENODEV;
|
|
}
|
|
|
|
- auxadc_base = devm_of_iomap(&pdev->dev, auxadc, 0, NULL);
|
|
- if (IS_ERR(auxadc_base)) {
|
|
- of_node_put(auxadc);
|
|
- return PTR_ERR(auxadc_base);
|
|
- }
|
|
-
|
|
+ auxadc_base = of_iomap(auxadc, 0);
|
|
auxadc_phys_base = of_get_phys_base(auxadc);
|
|
|
|
of_node_put(auxadc);
|
|
@@ -1243,12 +1238,7 @@ static int mtk_thermal_probe(struct plat
|
|
return -ENODEV;
|
|
}
|
|
|
|
- apmixed_base = devm_of_iomap(&pdev->dev, apmixedsys, 0, NULL);
|
|
- if (IS_ERR(apmixed_base)) {
|
|
- of_node_put(apmixedsys);
|
|
- return PTR_ERR(apmixed_base);
|
|
- }
|
|
-
|
|
+ apmixed_base = of_iomap(apmixedsys, 0);
|
|
apmixed_phys_base = of_get_phys_base(apmixedsys);
|
|
|
|
of_node_put(apmixedsys);
|