regulator/drivers/max8976: 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: Daniel Lezcano <daniel.lezcano@linexp.org>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220804224349.1926752-31-daniel.lezcano@linexp.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
index fdcb0f508984ccce66c74e1debc716aaf93662a4..596cc36aaff6ba7b37c7c2bb17a37a2d4bc35dc7 100644 (file)
--- a/drivers/regulator/max8973-regulator.c
+++ b/drivers/regulator/max8973-regulator.c
@@ -434,9 +434,9 @@ static int max8973_init_dcdc(struct max8973_chip *max,
        return ret;
 }
 
-static int max8973_thermal_read_temp(void *data, int *temp)
+static int max8973_thermal_read_temp(struct thermal_zone_device *tz, int *temp)
 {
-       struct max8973_chip *mchip = data;
+       struct max8973_chip *mchip = tz->devdata;
        unsigned int val;
        int ret;
 
@@ -465,7 +465,7 @@ static irqreturn_t max8973_thermal_irq(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-static const struct thermal_zone_of_device_ops max77621_tz_ops = {
+static const struct thermal_zone_device_ops max77621_tz_ops = {
        .get_temp = max8973_thermal_read_temp,
 };
 
@@ -479,8 +479,8 @@ static int max8973_thermal_init(struct max8973_chip *mchip)
        if (mchip->id != MAX77621)
                return 0;
 
-       tzd = devm_thermal_zone_of_sensor_register(mchip->dev, 0, mchip,
-                                                  &max77621_tz_ops);
+       tzd = devm_thermal_of_zone_register(mchip->dev, 0, mchip,
+                                           &max77621_tz_ops);
        if (IS_ERR(tzd)) {
                ret = PTR_ERR(tzd);
                dev_err(mchip->dev, "Failed to register thermal sensor: %d\n",