thermal/drivers/sun8i: Switch to new of 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: Daniel Lezcano <daniel.lezcano@linexp.org>
Link: https://lore.kernel.org/r/20220804224349.1926752-9-daniel.lezcano@linexp.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
index 212c87e63a667c02b686b2d7b075be9069c1ab7e..e64d06d1328ce0b3e3575b867dd87842a6cb56c9 100644 (file)
--- a/drivers/thermal/sun8i_thermal.c
+++ b/drivers/thermal/sun8i_thermal.c
@@ -108,9 +108,9 @@ static int sun50i_h5_calc_temp(struct ths_device *tmdev,
                return -1590 * reg / 10 + 276000;
 }
 
-static int sun8i_ths_get_temp(void *data, int *temp)
+static int sun8i_ths_get_temp(struct thermal_zone_device *tz, int *temp)
 {
-       struct tsensor *s = data;
+       struct tsensor *s = tz->devdata;
        struct ths_device *tmdev = s->tmdev;
        int val = 0;
 
@@ -135,7 +135,7 @@ static int sun8i_ths_get_temp(void *data, int *temp)
        return 0;
 }
 
-static const struct thermal_zone_of_device_ops ths_ops = {
+static const struct thermal_zone_device_ops ths_ops = {
        .get_temp = sun8i_ths_get_temp,
 };
 
@@ -468,10 +468,10 @@ static int sun8i_ths_register(struct ths_device *tmdev)
                tmdev->sensor[i].tmdev = tmdev;
                tmdev->sensor[i].id = i;
                tmdev->sensor[i].tzd =
-                       devm_thermal_zone_of_sensor_register(tmdev->dev,
-                                                            i,
-                                                            &tmdev->sensor[i],
-                                                            &ths_ops);
+                       devm_thermal_of_zone_register(tmdev->dev,
+                                                     i,
+                                                     &tmdev->sensor[i],
+                                                     &ths_ops);
                if (IS_ERR(tmdev->sensor[i].tzd))
                        return PTR_ERR(tmdev->sensor[i].tzd);