|
@@ -144,7 +144,6 @@ struct mtk_thermal {
|
|
s32 o_slope;
|
|
s32 o_slope;
|
|
s32 vts[MT8173_NUM_SENSORS];
|
|
s32 vts[MT8173_NUM_SENSORS];
|
|
|
|
|
|
- struct thermal_zone_device *tzd;
|
|
|
|
};
|
|
};
|
|
|
|
|
|
struct mtk_thermal_bank_cfg {
|
|
struct mtk_thermal_bank_cfg {
|
|
@@ -572,16 +571,11 @@ static int mtk_thermal_probe(struct platform_device *pdev)
|
|
|
|
|
|
platform_set_drvdata(pdev, mt);
|
|
platform_set_drvdata(pdev, mt);
|
|
|
|
|
|
- mt->tzd = thermal_zone_of_sensor_register(&pdev->dev, 0, mt,
|
|
|
|
- &mtk_thermal_ops);
|
|
|
|
- if (IS_ERR(mt->tzd))
|
|
|
|
- goto err_register;
|
|
|
|
|
|
+ devm_thermal_zone_of_sensor_register(&pdev->dev, 0, mt,
|
|
|
|
+ &mtk_thermal_ops);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
-err_register:
|
|
|
|
- clk_disable_unprepare(mt->clk_peri_therm);
|
|
|
|
-
|
|
|
|
err_disable_clk_auxadc:
|
|
err_disable_clk_auxadc:
|
|
clk_disable_unprepare(mt->clk_auxadc);
|
|
clk_disable_unprepare(mt->clk_auxadc);
|
|
|
|
|
|
@@ -592,8 +586,6 @@ static int mtk_thermal_remove(struct platform_device *pdev)
|
|
{
|
|
{
|
|
struct mtk_thermal *mt = platform_get_drvdata(pdev);
|
|
struct mtk_thermal *mt = platform_get_drvdata(pdev);
|
|
|
|
|
|
- thermal_zone_of_sensor_unregister(&pdev->dev, mt->tzd);
|
|
|
|
-
|
|
|
|
clk_disable_unprepare(mt->clk_peri_therm);
|
|
clk_disable_unprepare(mt->clk_peri_therm);
|
|
clk_disable_unprepare(mt->clk_auxadc);
|
|
clk_disable_unprepare(mt->clk_auxadc);
|
|
|
|
|