thermal: convert hisi_thermal to use devm_thermal_zone_of_sensor_register
authorEduardo Valentin <edubezval@gmail.com>
Wed, 9 Mar 2016 21:07:13 +0000 (13:07 -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: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
drivers/thermal/hisi_thermal.c

index 5e820b5415063b17fdd2982c0adfd5885db769b9..aee88bd3a5b62e0a65fc9dee4ccd5e8b6d041d42 100644 (file)
@@ -243,8 +243,8 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev,
        sensor->id = index;
        sensor->thermal = data;
 
-       sensor->tzd = thermal_zone_of_sensor_register(&pdev->dev, sensor->id,
-                               sensor, &hisi_of_thermal_ops);
+       sensor->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev,
+                               sensor->id, sensor, &hisi_of_thermal_ops);
        if (IS_ERR(sensor->tzd)) {
                ret = PTR_ERR(sensor->tzd);
                dev_err(&pdev->dev, "failed to register sensor id %d: %d\n",
@@ -364,7 +364,6 @@ static int hisi_thermal_remove(struct platform_device *pdev)
                struct hisi_thermal_sensor *sensor = &data->sensors[i];
 
                hisi_thermal_toggle_sensor(sensor, false);
-               thermal_zone_of_sensor_unregister(&pdev->dev, sensor->tzd);
        }
 
        hisi_thermal_disable_sensor(data);