thermal/drivers/st: 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-13-daniel.lezcano@linexp.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/thermal/st/stm_thermal.c b/drivers/thermal/st/stm_thermal.c
index 5fd3fb8912a6a796f0a5d8953b3e2def32ded5d3..78feb802a87d2b1a344d548091afd8da39e149fa 100644 (file)
--- a/drivers/thermal/st/stm_thermal.c
+++ b/drivers/thermal/st/stm_thermal.c
@@ -302,9 +302,9 @@ static int stm_disable_irq(struct stm_thermal_sensor *sensor)
        return 0;
 }
 
-static int stm_thermal_set_trips(void *data, int low, int high)
+static int stm_thermal_set_trips(struct thermal_zone_device *tz, int low, int high)
 {
-       struct stm_thermal_sensor *sensor = data;
+       struct stm_thermal_sensor *sensor = tz->devdata;
        u32 itr1, th;
        int ret;
 
@@ -350,9 +350,9 @@ static int stm_thermal_set_trips(void *data, int low, int high)
 }
 
 /* Callback to get temperature from HW */
-static int stm_thermal_get_temp(void *data, int *temp)
+static int stm_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
 {
-       struct stm_thermal_sensor *sensor = data;
+       struct stm_thermal_sensor *sensor = tz->devdata;
        u32 periods;
        int freqM, ret;
 
@@ -474,7 +474,7 @@ static int stm_thermal_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(stm_thermal_pm_ops,
                         stm_thermal_suspend, stm_thermal_resume);
 
-static const struct thermal_zone_of_device_ops stm_tz_ops = {
+static const struct thermal_zone_device_ops stm_tz_ops = {
        .get_temp       = stm_thermal_get_temp,
        .set_trips      = stm_thermal_set_trips,
 };
@@ -539,9 +539,9 @@ static int stm_thermal_probe(struct platform_device *pdev)
                return ret;
        }
 
-       sensor->th_dev = devm_thermal_zone_of_sensor_register(&pdev->dev, 0,
-                                                             sensor,
-                                                             &stm_tz_ops);
+       sensor->th_dev = devm_thermal_of_zone_register(&pdev->dev, 0,
+                                                      sensor,
+                                                      &stm_tz_ops);
 
        if (IS_ERR(sensor->th_dev)) {
                dev_err(&pdev->dev, "%s: thermal zone sensor registering KO\n",
@@ -572,7 +572,6 @@ static int stm_thermal_probe(struct platform_device *pdev)
        return 0;
 
 err_tz:
-       thermal_zone_of_sensor_unregister(&pdev->dev, sensor->th_dev);
        return ret;
 }
 
@@ -582,7 +581,6 @@ static int stm_thermal_remove(struct platform_device *pdev)
 
        stm_thermal_sensor_off(sensor);
        thermal_remove_hwmon_sysfs(sensor->th_dev);
-       thermal_zone_of_sensor_unregister(&pdev->dev, sensor->th_dev);
 
        return 0;
 }