Commit d377aba1 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Eduardo Valentin

thermal/drivers/generic-iio-adc: Switch tz request to devm version

Everything mentionned here:
 https://lkml.org/lkml/2016/4/20/850

This driver was added before the devm_iio_channel_get() function version was
merged. The sensor should be released before the iio channel, thus we had to
use the non-devm version of thermal_zone_of_sensor_register().

Now the devm_iio_channel_get() is available, do the corresponding change in
this driver and remove gadc_thermal_remove().

[Compiled tested only]
Acked-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 07209fcf
...@@ -126,37 +126,22 @@ static int gadc_thermal_probe(struct platform_device *pdev) ...@@ -126,37 +126,22 @@ static int gadc_thermal_probe(struct platform_device *pdev)
gti->dev = &pdev->dev; gti->dev = &pdev->dev;
platform_set_drvdata(pdev, gti); platform_set_drvdata(pdev, gti);
gti->channel = iio_channel_get(&pdev->dev, "sensor-channel"); gti->channel = devm_iio_channel_get(&pdev->dev, "sensor-channel");
if (IS_ERR(gti->channel)) { if (IS_ERR(gti->channel)) {
ret = PTR_ERR(gti->channel); ret = PTR_ERR(gti->channel);
dev_err(&pdev->dev, "IIO channel not found: %d\n", ret); dev_err(&pdev->dev, "IIO channel not found: %d\n", ret);
return ret; return ret;
} }
gti->tz_dev = thermal_zone_of_sensor_register(&pdev->dev, 0, gti->tz_dev = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, gti,
gti, &gadc_thermal_ops); &gadc_thermal_ops);
if (IS_ERR(gti->tz_dev)) { if (IS_ERR(gti->tz_dev)) {
ret = PTR_ERR(gti->tz_dev); ret = PTR_ERR(gti->tz_dev);
dev_err(&pdev->dev, "Thermal zone sensor register failed: %d\n", dev_err(&pdev->dev, "Thermal zone sensor register failed: %d\n",
ret); ret);
goto sensor_fail; return ret;
} }
return 0;
sensor_fail:
iio_channel_release(gti->channel);
return ret;
}
static int gadc_thermal_remove(struct platform_device *pdev)
{
struct gadc_thermal_info *gti = platform_get_drvdata(pdev);
thermal_zone_of_sensor_unregister(&pdev->dev, gti->tz_dev);
iio_channel_release(gti->channel);
return 0; return 0;
} }
...@@ -172,7 +157,6 @@ static struct platform_driver gadc_thermal_driver = { ...@@ -172,7 +157,6 @@ static struct platform_driver gadc_thermal_driver = {
.of_match_table = of_adc_thermal_match, .of_match_table = of_adc_thermal_match,
}, },
.probe = gadc_thermal_probe, .probe = gadc_thermal_probe,
.remove = gadc_thermal_remove,
}; };
module_platform_driver(gadc_thermal_driver); module_platform_driver(gadc_thermal_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment