thermal: convert mtk_thermal to use devm_thermal_zone_of_sensor_register
authorEduardo Valentin <edubezval@gmail.com>
Wed, 9 Mar 2016 21:08:14 +0000 (13:08 -0800)
committerEduardo Valentin <edubezval@gmail.com>
Tue, 17 May 2016 14:28:26 +0000 (07:28 -0700)
This changes the driver to use the devm_ version
of thermal_zone_of_sensor_register and cleans
up the  local points and unregister calls.

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
drivers/thermal/mtk_thermal.c

index 507632b9648e3e193942ca3cc190c2cfab705d66..262ab0a2266f71242708cca87e524ba2bbf179f1 100644 (file)
@@ -144,7 +144,6 @@ struct mtk_thermal {
        s32 o_slope;
        s32 vts[MT8173_NUM_SENSORS];
 
-       struct thermal_zone_device *tzd;
 };
 
 struct mtk_thermal_bank_cfg {
@@ -572,16 +571,11 @@ static int mtk_thermal_probe(struct platform_device *pdev)
 
        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;
 
-err_register:
-       clk_disable_unprepare(mt->clk_peri_therm);
-
 err_disable_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);
 
-       thermal_zone_of_sensor_unregister(&pdev->dev, mt->tzd);
-
        clk_disable_unprepare(mt->clk_peri_therm);
        clk_disable_unprepare(mt->clk_auxadc);