Commit 50e53291 authored by Daniel Lezcano's avatar Daniel Lezcano
Browse files

thermal/core: Avoid calling ->get_trip_temp() unnecessarily 



As the trip temperature is already available when calling the function
handle_critical_trips(), pass it as a parameter instead of having this
function calling the ops again to retrieve the same data.

Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Reviewed-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20220718145038.1114379-2-daniel.lezcano@linaro.org
parent 7a12f918

drivers/thermal/thermal_core.c

+2 −6
Original line number Diff line number Diff line
@@ -340,12 +340,8 @@ void thermal_zone_device_critical(struct thermal_zone_device *tz) 
EXPORT_SYMBOL(thermal_zone_device_critical);



static void handle_critical_trips(struct thermal_zone_device *tz,

				  int trip, enum thermal_trip_type trip_type)

				  int trip, int trip_temp, enum thermal_trip_type trip_type)

{

	int trip_temp;



	tz->ops->get_trip_temp(tz, trip, &trip_temp);



	/* If we have not crossed the trip_temp, we do not care. */

	if (trip_temp <= 0 || tz->temperature < trip_temp)

		return;
@@ -384,7 +380,7 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip) 
	}



	if (type == THERMAL_TRIP_CRITICAL || type == THERMAL_TRIP_HOT)

		handle_critical_trips(tz, trip, type);

		handle_critical_trips(tz, trip, trip_temp, type);

	else

		handle_non_critical_trips(tz, trip);

	/*