[v1] thermal: core: Drop redundant trips check from for_each_thermal_trip()

Message ID 5981326.lOV4Wx5bFT@kreacher
State New
Headers
Series [v1] thermal: core: Drop redundant trips check from for_each_thermal_trip() |

Commit Message

Rafael J. Wysocki Sept. 19, 2023, 6:59 p.m. UTC
  From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

It is invalid to call for_each_thermal_trip() on an unregistered thermal
zone anyway, and as per thermal_zone_device_register_with_trips(), the
trips[] table must be present if num_trips is greater than zero for the
given thermal zone.

Hence, the trips check in for_each_thermal_trip() is redundant and so it
can be dropped.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 drivers/thermal/thermal_trip.c |    3 ---
 1 file changed, 3 deletions(-)
  

Comments

Daniel Lezcano Sept. 26, 2023, 1:48 p.m. UTC | #1
On 19/09/2023 20:59, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> It is invalid to call for_each_thermal_trip() on an unregistered thermal
> zone anyway, and as per thermal_zone_device_register_with_trips(), the
> trips[] table must be present if num_trips is greater than zero for the
> given thermal zone.
> 
> Hence, the trips check in for_each_thermal_trip() is redundant and so it
> can be dropped.
> 
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---

Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
  

Patch

Index: linux-pm/drivers/thermal/thermal_trip.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_trip.c
+++ linux-pm/drivers/thermal/thermal_trip.c
@@ -17,9 +17,6 @@  int for_each_thermal_trip(struct thermal
 
 	lockdep_assert_held(&tz->lock);
 
-	if (!tz->trips)
-		return -ENODATA;
-
 	for (i = 0; i < tz->num_trips; i++) {
 		ret = cb(&tz->trips[i], data);
 		if (ret)