aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/thermal/thermal_core.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index d6ebc1cf6aa9..39fc8124741c 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -315,9 +315,7 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz)
315 mutex_unlock(&tz->lock); 315 mutex_unlock(&tz->lock);
316} 316}
317 317
318static void handle_non_critical_trips(struct thermal_zone_device *tz, 318static void handle_non_critical_trips(struct thermal_zone_device *tz, int trip)
319 int trip,
320 enum thermal_trip_type trip_type)
321{ 319{
322 tz->governor ? tz->governor->throttle(tz, trip) : 320 tz->governor ? tz->governor->throttle(tz, trip) :
323 def_governor->throttle(tz, trip); 321 def_governor->throttle(tz, trip);
@@ -418,7 +416,7 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)
418 if (type == THERMAL_TRIP_CRITICAL || type == THERMAL_TRIP_HOT) 416 if (type == THERMAL_TRIP_CRITICAL || type == THERMAL_TRIP_HOT)
419 handle_critical_trips(tz, trip, type); 417 handle_critical_trips(tz, trip, type);
420 else 418 else
421 handle_non_critical_trips(tz, trip, type); 419 handle_non_critical_trips(tz, trip);
422 /* 420 /*
423 * Alright, we handled this trip successfully. 421 * Alright, we handled this trip successfully.
424 * So, start monitoring again. 422 * So, start monitoring again.