| Message ID | 20220804224349.1926752-14-daniel.lezcano@linexp.org (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Daniel Lezcano |
| Headers | show |
| Series | New thermal OF code | expand |
On 05/08/2022 00:43, Daniel Lezcano wrote: > 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> > --- > drivers/thermal/amlogic_thermal.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/thermal/amlogic_thermal.c b/drivers/thermal/amlogic_thermal.c > index e61b91d14ad1..d30cb791e63c 100644 > --- a/drivers/thermal/amlogic_thermal.c > +++ b/drivers/thermal/amlogic_thermal.c > @@ -179,12 +179,12 @@ static int amlogic_thermal_disable(struct amlogic_thermal *data) > return 0; > } > > -static int amlogic_thermal_get_temp(void *data, int *temp) > +static int amlogic_thermal_get_temp(struct thermal_zone_device *tz, int *temp) > { > unsigned int tval; > - struct amlogic_thermal *pdata = data; > + struct amlogic_thermal *pdata = tz->devdata; > > - if (!data) > + if (!pdata) > return -EINVAL; > > regmap_read(pdata->regmap, TSENSOR_STAT0, &tval); > @@ -195,7 +195,7 @@ static int amlogic_thermal_get_temp(void *data, int *temp) > return 0; > } > > -static const struct thermal_zone_of_device_ops amlogic_thermal_ops = { > +static const struct thermal_zone_device_ops amlogic_thermal_ops = { > .get_temp = amlogic_thermal_get_temp, > }; > > @@ -276,10 +276,10 @@ static int amlogic_thermal_probe(struct platform_device *pdev) > return PTR_ERR(pdata->sec_ao_map); > } > > - pdata->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, > - 0, > - pdata, > - &amlogic_thermal_ops); > + pdata->tzd = devm_thermal_of_zone_register(&pdev->dev, > + 0, > + pdata, > + &amlogic_thermal_ops); > if (IS_ERR(pdata->tzd)) { > ret = PTR_ERR(pdata->tzd); > dev_err(dev, "Failed to register tsensor: %d\n", ret); Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
diff --git a/drivers/thermal/amlogic_thermal.c b/drivers/thermal/amlogic_thermal.c index e61b91d14ad1..d30cb791e63c 100644 --- a/drivers/thermal/amlogic_thermal.c +++ b/drivers/thermal/amlogic_thermal.c @@ -179,12 +179,12 @@ static int amlogic_thermal_disable(struct amlogic_thermal *data) return 0; } -static int amlogic_thermal_get_temp(void *data, int *temp) +static int amlogic_thermal_get_temp(struct thermal_zone_device *tz, int *temp) { unsigned int tval; - struct amlogic_thermal *pdata = data; + struct amlogic_thermal *pdata = tz->devdata; - if (!data) + if (!pdata) return -EINVAL; regmap_read(pdata->regmap, TSENSOR_STAT0, &tval); @@ -195,7 +195,7 @@ static int amlogic_thermal_get_temp(void *data, int *temp) return 0; } -static const struct thermal_zone_of_device_ops amlogic_thermal_ops = { +static const struct thermal_zone_device_ops amlogic_thermal_ops = { .get_temp = amlogic_thermal_get_temp, }; @@ -276,10 +276,10 @@ static int amlogic_thermal_probe(struct platform_device *pdev) return PTR_ERR(pdata->sec_ao_map); } - pdata->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, - 0, - pdata, - &amlogic_thermal_ops); + pdata->tzd = devm_thermal_of_zone_register(&pdev->dev, + 0, + pdata, + &amlogic_thermal_ops); if (IS_ERR(pdata->tzd)) { ret = PTR_ERR(pdata->tzd); dev_err(dev, "Failed to register tsensor: %d\n", ret);
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> --- drivers/thermal/amlogic_thermal.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)