* [PATCH v4 27/32] iio/drivers/sun4i_gpadc: Switch to new of thermal API
[not found] <20220801212244.1124867-1-daniel.lezcano@linexp.org>
@ 2022-08-01 21:22 ` Daniel Lezcano
0 siblings, 0 replies; only message in thread
From: Daniel Lezcano @ 2022-08-01 21:22 UTC (permalink / raw)
To: daniel.lezcano, rafael
Cc: rui.zhang, linux-pm, linux-kernel, khilman, abailon, lukasz.luba,
broonie, damien.lemoal, heiko, hayashi.kunihiko, mhiramat, talel,
thierry.reding, digetx, jonathanh, anarsoul, tiny.windzz,
baolin.wang7, f.fainelli, bjorn.andersson, mcoquelin.stm32,
glaroque, miquel.raynal, shawnguo, niklas.soderlund, matthias.bgg,
j-keerthy, Jonathan Cameron, Jonathan Cameron, Lars-Peter Clausen,
Chen-Yu Tsai, Jernej Skrabec, Samuel Holland,
open list:IIO SUBSYSTEM AND DRIVERS,
moderated list:ARM/Allwinner sunXi SoC support,
open list:ARM/Allwinner sunXi SoC support
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: Daniel Lezcano <daniel.lezcano@linexp.org>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/iio/adc/sun4i-gpadc-iio.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c
index 2d393a4dfff6..13d1e937357c 100644
--- a/drivers/iio/adc/sun4i-gpadc-iio.c
+++ b/drivers/iio/adc/sun4i-gpadc-iio.c
@@ -412,9 +412,9 @@ static int sun4i_gpadc_runtime_resume(struct device *dev)
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;
if (sun4i_gpadc_temp_read(info->indio_dev, &val))
@@ -428,7 +428,7 @@ static int sun4i_gpadc_get_temp(void *data, int *temp)
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,
};
@@ -637,9 +637,9 @@ static int sun4i_gpadc_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev);
if (IS_ENABLED(CONFIG_THERMAL_OF)) {
- info->tzd = thermal_zone_of_sensor_register(info->sensor_device,
- 0, info,
- &sun4i_ts_tz_ops);
+ info->tzd = thermal_of_zone_register(info->sensor_device,
+ 0, info,
+ &sun4i_ts_tz_ops);
/*
* Do not fail driver probing when failing to register in
* thermal because no thermal DT node is found.
--
2.25.1
^ permalink raw reply related [flat|nested] only message in thread