A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-31 04:01:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

thermal: convert rockchip_thermal to use devm_thermal_zone_of_sensor_register

Browse source 
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 <[email protected]>
Cc: Heiko Stuebner <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Tested-by: Caesar Wang <[email protected]>
Reviewed-by: Caesar Wang <[email protected]>
Reviewed-by: Heiko Stuebner <[email protected]>
Signed-off-by: Eduardo Valentin <[email protected]>
This commit is contained in:
Eduardo Valentin 2016-03-09 13:10:28 -08:00
commit 2633ad1913
1 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/thermal/rockchip_thermal.c
View file

@ -786,8 +786,8 @@ rockchip_thermal_register_sensor(struct platform_device *pdev,
sensor->thermal = thermal;
sensor->id = id;
sensor->tzd = thermal_zone_of_sensor_register(&pdev->dev, id, sensor,
&rockchip_of_thermal_ops);
sensor->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, id,
sensor, &rockchip_of_thermal_ops);
if (IS_ERR(sensor->tzd)) {
error = PTR_ERR(sensor->tzd);
dev_err(&pdev->dev, "failed to register sensor %d: %d\n",
@ -815,7 +815,7 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
const struct of_device_id *match;
struct resource *res;
int irq;
int i, j;
int i;
int error;
match = of_match_node(of_rockchip_thermal_match, np);
@ -898,9 +898,6 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
dev_err(&pdev->dev,
"failed to register sensor[%d] : error = %d\n",
i, error);
for (j = 0; j < i; j++)
thermal_zone_of_sensor_unregister(&pdev->dev,
thermal->sensors[j].tzd);
goto err_disable_pclk;
}
}
@ -912,7 +909,7 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
if (error) {
dev_err(&pdev->dev,
"failed to request tsadc irq: %d\n", error);
goto err_unregister_sensor;
goto err_disable_pclk;
}
thermal->chip->control(thermal->regs, true);
@ -924,11 +921,6 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
return 0;
err_unregister_sensor:
while (i--)
thermal_zone_of_sensor_unregister(&pdev->dev,
thermal->sensors[i].tzd);
err_disable_pclk:
clk_disable_unprepare(thermal->pclk);
err_disable_clk:
@ -946,7 +938,6 @@ static int rockchip_thermal_remove(struct platform_device *pdev)
struct rockchip_thermal_sensor *sensor = &thermal->sensors[i];
rockchip_thermal_toggle_sensor(sensor, false);
thermal_zone_of_sensor_unregister(&pdev->dev, sensor->tzd);
}
thermal->chip->control(thermal->regs, false);