Skip to content

Commit

Permalink
thermal: trip: Use for_each_trip() in __thermal_zone_set_trips()
Browse files Browse the repository at this point in the history
Make __thermal_zone_set_trips() use for_each_trip() instead of an open-
coded loop over trip indices.

No intentional functional impact.

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>
  • Loading branch information
Rafael J. Wysocki committed Dec 13, 2023
1 parent b6515a8 commit 0c0c474
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions drivers/thermal/thermal_trip.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,35 +63,31 @@ EXPORT_SYMBOL_GPL(thermal_zone_get_num_trips);
*/
void __thermal_zone_set_trips(struct thermal_zone_device *tz)
{
struct thermal_trip trip;
const struct thermal_trip *trip;
int low = -INT_MAX, high = INT_MAX;
bool same_trip = false;
int i, ret;
int ret;

lockdep_assert_held(&tz->lock);

if (!tz->ops->set_trips)
return;

for (i = 0; i < tz->num_trips; i++) {
for_each_trip(tz, trip) {
bool low_set = false;
int trip_low;

ret = __thermal_zone_get_trip(tz, i , &trip);
if (ret)
return;

trip_low = trip.temperature - trip.hysteresis;
trip_low = trip->temperature - trip->hysteresis;

if (trip_low < tz->temperature && trip_low > low) {
low = trip_low;
low_set = true;
same_trip = false;
}

if (trip.temperature > tz->temperature &&
trip.temperature < high) {
high = trip.temperature;
if (trip->temperature > tz->temperature &&
trip->temperature < high) {
high = trip->temperature;
same_trip = low_set;
}
}
Expand Down

0 comments on commit 0c0c474

Please sign in to comment.