Commit 86edac7d authored May 25, 2023 by Ricardo Cañuelo Committed by Daniel Lezcano Jun 26, 2023

Revert "thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe"

This reverts commit f05c7b7d.

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: f05c7b7d ("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

parent 4af164c1

drivers/thermal/mediatek/auxadc_thermal.c

+2 −12

Original line number	Diff line number	Diff line
		@@ -1222,12 +1222,7 @@ static int mtk_thermal_probe(struct platform_device *pdev)
		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 platform_device *pdev)
		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);