Re: [PATCH v5 24/33] thermal/drivers/ti-soc: Switch to new of API

J, KEERTHY
2022-08-05T01:20:06Z

On 8/5/2022 4:13 AM, 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.

Acked-by: Keerthy <j-keerthy@ti.com>

>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linexp.org>
> ---
> .../thermal/ti-soc-thermal/ti-thermal-common.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
> index 703039d8b937..8a9055bd376e 100644
> --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
> +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
> @@ -65,10 +65,10 @@ static inline int ti_thermal_hotspot_temperature(int t, int s, int c)
>
> /* thermal zone ops */
> /* Get temperature callback function for thermal zone */
> -static inline int __ti_thermal_get_temp(void *devdata, int *temp)
> +static inline int __ti_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
> {
> struct thermal_zone_device *pcb_tz = NULL;
> - struct ti_thermal_data *data = devdata;
> + struct ti_thermal_data *data = tz->devdata;
> struct ti_bandgap *bgp;
> const struct ti_temp_sensor *s;
> int ret, tmp, slope, constant;
> @@ -85,8 +85,8 @@ static inline int __ti_thermal_get_temp(void *devdata, int *temp)
> return ret;
>
> /* Default constants */
> - slope = thermal_zone_get_slope(data->ti_thermal);
> - constant = thermal_zone_get_offset(data->ti_thermal);
> + slope = thermal_zone_get_slope(tz);
> + constant = thermal_zone_get_offset(tz);
>
> pcb_tz = data->pcb_tz;
> /* In case pcb zone is available, use the extrapolation rule with it */
> @@ -107,9 +107,9 @@ static inline int __ti_thermal_get_temp(void *devdata, int *temp)
> return ret;
> }
>
> -static int __ti_thermal_get_trend(void *p, int trip, enum thermal_trend *trend)
> +static int __ti_thermal_get_trend(struct thermal_zone_device *tz, int trip, enum thermal_trend *trend)
> {
> - struct ti_thermal_data *data = p;
> + struct ti_thermal_data *data = tz->devdata;
> struct ti_bandgap *bgp;
> int id, tr, ret = 0;
>
> @@ -130,7 +130,7 @@ static int __ti_thermal_get_trend(void *p, int trip, enum thermal_trend *trend)
> return 0;
> }
>
> -static const struct thermal_zone_of_device_ops ti_of_thermal_ops = {
> +static const struct thermal_zone_device_ops ti_of_thermal_ops = {
> .get_temp = __ti_thermal_get_temp,
> .get_trend = __ti_thermal_get_trend,
> };
> @@ -170,7 +170,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,
> return -EINVAL;
>
> /* in case this is specified by DT */
> - data->ti_thermal = devm_thermal_zone_of_sensor_register(bgp->dev, id,
> + data->ti_thermal = devm_thermal_of_zone_register(bgp->dev, id,
> data, &ti_of_thermal_ops);
> if (IS_ERR(data->ti_thermal)) {
> dev_err(bgp->dev, "thermal zone device is NULL\n");