Commit 0c0c4740 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

thermal: trip: Use for_each_trip() in __thermal_zone_set_trips() 



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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
parent b6515a88

drivers/thermal/thermal_trip.c

+7 −11
Original line number Diff line number Diff line
@@ -63,25 +63,21 @@ 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;
@@ -89,9 +85,9 @@ void __thermal_zone_set_trips(struct thermal_zone_device *tz) 
			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;

		}

	}