From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 12 Oct 2023 18:25:06 +0000 (+0200)
Subject: thermal: trip: Simplify computing trip indices
X-Git-Tag: v6.7-rc1~159^2~2^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78869767f2ad3a98d2c830b718a503d8b0a94b26;p=thirdparty%2Fkernel%2Flinux.git

thermal: trip: Simplify computing trip indices

A trip index can be computed right away as a difference between the
value of a trip pointer pointing to the given trip object and the
start of the trips[] table in the given thermal zone, so change
thermal_zone_trip_id() accordingly.

No intentional functional impact (except for some speedup).

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Tested-by: Lukasz Luba <lukasz.luba@arm.com>
---

diff --git a/drivers/thermal/thermal_trip.c b/drivers/thermal/thermal_trip.c
index 80f3cdb2f30ee..6dff0dae6ef69 100644
--- a/drivers/thermal/thermal_trip.c
+++ b/drivers/thermal/thermal_trip.c
@@ -173,12 +173,9 @@ int thermal_zone_set_trip(struct thermal_zone_device *tz, int trip_id,
 int thermal_zone_trip_id(struct thermal_zone_device *tz,
 			 const struct thermal_trip *trip)
 {
-	int i;
-
-	for (i = 0; i < tz->num_trips; i++) {
-		if (&tz->trips[i] == trip)
-			return i;
-	}
-
-	return -ENODATA;
+	/*
+	 * Assume the trip to be located within the bounds of the thermal
+	 * zone's trips[] table.
+	 */
+	return trip - tz->trips;
 }