Commit de15b840 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Daniel Lezcano

iio/drivers/sun4i_gpadc: Switch to new of thermal API

The thermal OF code has a new API allowing to migrate the OF
initialization to a simpler approach. The ops are no longer device
tree specific and are the generic ones provided by the core code.

Convert the ops to the thermal_zone_device_ops format and use the new
API to register the thermal zone with these generic ops.
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linexp.org>
Acked-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Link: https://lore.kernel.org/r/20220804224349.1926752-29-daniel.lezcano@linexp.orgSigned-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent e5181331
...@@ -412,9 +412,9 @@ static int sun4i_gpadc_runtime_resume(struct device *dev) ...@@ -412,9 +412,9 @@ static int sun4i_gpadc_runtime_resume(struct device *dev)
return 0; return 0;
} }
static int sun4i_gpadc_get_temp(void *data, int *temp) static int sun4i_gpadc_get_temp(struct thermal_zone_device *tz, int *temp)
{ {
struct sun4i_gpadc_iio *info = data; struct sun4i_gpadc_iio *info = tz->devdata;
int val, scale, offset; int val, scale, offset;
if (sun4i_gpadc_temp_read(info->indio_dev, &val)) if (sun4i_gpadc_temp_read(info->indio_dev, &val))
...@@ -428,7 +428,7 @@ static int sun4i_gpadc_get_temp(void *data, int *temp) ...@@ -428,7 +428,7 @@ static int sun4i_gpadc_get_temp(void *data, int *temp)
return 0; return 0;
} }
static const struct thermal_zone_of_device_ops sun4i_ts_tz_ops = { static const struct thermal_zone_device_ops sun4i_ts_tz_ops = {
.get_temp = &sun4i_gpadc_get_temp, .get_temp = &sun4i_gpadc_get_temp,
}; };
...@@ -637,9 +637,9 @@ static int sun4i_gpadc_probe(struct platform_device *pdev) ...@@ -637,9 +637,9 @@ static int sun4i_gpadc_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
if (IS_ENABLED(CONFIG_THERMAL_OF)) { if (IS_ENABLED(CONFIG_THERMAL_OF)) {
info->tzd = thermal_zone_of_sensor_register(info->sensor_device, info->tzd = devm_thermal_of_zone_register(info->sensor_device,
0, info, 0, info,
&sun4i_ts_tz_ops); &sun4i_ts_tz_ops);
/* /*
* Do not fail driver probing when failing to register in * Do not fail driver probing when failing to register in
* thermal because no thermal DT node is found. * thermal because no thermal DT node is found.
...@@ -681,8 +681,6 @@ static int sun4i_gpadc_remove(struct platform_device *pdev) ...@@ -681,8 +681,6 @@ static int sun4i_gpadc_remove(struct platform_device *pdev)
if (!IS_ENABLED(CONFIG_THERMAL_OF)) if (!IS_ENABLED(CONFIG_THERMAL_OF))
return 0; return 0;
thermal_zone_of_sensor_unregister(info->sensor_device, info->tzd);
if (!info->no_irq) if (!info->no_irq)
iio_map_array_unregister(indio_dev); iio_map_array_unregister(indio_dev);
......
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