Re: [PATCH v3 15/30] thermal/drivers/armada: Use generic thermal_zone_get_trip() function

[Daniel Lezcano]

Hi Miquel,

any comment on this patch?

On 06/09/2022 18:47, Daniel Lezcano wrote:
> The thermal framework gives the possibility to register the trip
> points with the thermal zone. When that is done, no get_trip_* ops are
> needed and they can be removed.
>
> Convert ops content logic into generic trip points and register them with the
> thermal zone.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
> ---
>   drivers/thermal/armada_thermal.c | 39 ++++++++++++++++----------------
>   1 file changed, 20 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
> index 52d63b3997fe..9444e5a22ca0 100644
> --- a/drivers/thermal/armada_thermal.c
> +++ b/drivers/thermal/armada_thermal.c
> @@ -785,33 +785,34 @@ static int armada_configure_overheat_int(struct armada_thermal_priv *priv,
>   					 int sensor_id)
>   {
>   	/* Retrieve the critical trip point to enable the overheat interrupt */
> -	const struct thermal_trip *trips = of_thermal_get_trip_points(tz);
> +	struct thermal_trip trip;
>   	int ret;
>   	int i;
>   
> -	if (!trips)
> -		return -EINVAL;
> -
> -	for (i = 0; i < of_thermal_get_ntrips(tz); i++)
> -		if (trips[i].type == THERMAL_TRIP_CRITICAL)
> -			break;
> +	for (i = 0; i < thermal_zone_get_num_trips(tz); i++) {
>   
> -	if (i == of_thermal_get_ntrips(tz))
> -		return -EINVAL;
> +		ret = thermal_zone_get_trip(tz, i, &trip);
> +		if (ret)
> +			return ret;
> +		
> +		if (trip.type != THERMAL_TRIP_CRITICAL)
> +			continue;
>   
> -	ret = armada_select_channel(priv, sensor_id);
> -	if (ret)
> -		return ret;
> +		ret = armada_select_channel(priv, sensor_id);
> +		if (ret)
> +			return ret;
> +		
> +		armada_set_overheat_thresholds(priv, trip.temperature,
> +					       trip.hysteresis);
> +		priv->overheat_sensor = tz;
> +		priv->interrupt_source = sensor_id;
>   
> -	armada_set_overheat_thresholds(priv,
> -				       trips[i].temperature,
> -				       trips[i].hysteresis);
> -	priv->overheat_sensor = tz;
> -	priv->interrupt_source = sensor_id;
> +		armada_enable_overheat_interrupt(priv);
>   
> -	armada_enable_overheat_interrupt(priv);
> +		return 0;
> +	}
>   
> -	return 0;
> +	return -EINVAL;
>   }
>   
>   static int armada_thermal_probe(struct platform_device *pdev)


--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog