[v2,1/2] thermal: trip: Drop a redundant check from thermal_zone_set_trip()

Message ID 4544904.LvFx2qVVIh@kreacher
State New
Headers
Series thermal: trip: Rework thermal_zone_set_trip() and its callers |

Commit Message

Rafael J. Wysocki Nov. 28, 2023, 1:56 p.m. UTC
  From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

After recent changes in the thermal framework, a trip points array is
required for registering a thermal zone that is not tripless, so the
tz->trips pointer in thermal_zone_set_trip() is never NULL and the
check involving it is redundant.  Drop that check.

No functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

New patch in v2.

---
 drivers/thermal/thermal_trip.c |    3 ---
 1 file changed, 3 deletions(-)
  

Comments

Lukasz Luba Nov. 28, 2023, 9:44 p.m. UTC | #1
On 11/28/23 13:56, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> After recent changes in the thermal framework, a trip points array is
> required for registering a thermal zone that is not tripless, so the
> tz->trips pointer in thermal_zone_set_trip() is never NULL and the
> check involving it is redundant.  Drop that check.
> 
> No functional impact.
> 
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> 
> New patch in v2.
> 
> ---
>   drivers/thermal/thermal_trip.c |    3 ---
>   1 file changed, 3 deletions(-)
> 
> Index: linux-pm/drivers/thermal/thermal_trip.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/thermal_trip.c
> +++ linux-pm/drivers/thermal/thermal_trip.c
> @@ -153,9 +153,6 @@ int thermal_zone_set_trip(struct thermal
>   	struct thermal_trip t;
>   	int ret;
>   
> -	if (!tz->ops->set_trip_temp && !tz->ops->set_trip_hyst && !tz->trips)
> -		return -EINVAL;
> -
>   	ret = __thermal_zone_get_trip(tz, trip_id, &t);
>   	if (ret)
>   		return ret;
> 
> 
> 

LGTM

Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
  

Patch

Index: linux-pm/drivers/thermal/thermal_trip.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_trip.c
+++ linux-pm/drivers/thermal/thermal_trip.c
@@ -153,9 +153,6 @@  int thermal_zone_set_trip(struct thermal
 	struct thermal_trip t;
 	int ret;
 
-	if (!tz->ops->set_trip_temp && !tz->ops->set_trip_hyst && !tz->trips)
-		return -EINVAL;
-
 	ret = __thermal_zone_get_trip(tz, trip_id, &t);
 	if (ret)
 		return ret;