diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-09 11:46:18 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-09 11:46:18 +1100 |
commit | 454761b7999d80ca1b46aa30a9d66f6bd777cf27 (patch) | |
tree | 1ab25fd37c030a9d15564be0e0c56590037051d7 /drivers/thermal/fair_share.c | |
parent | abee539debce72079a0c559f4fe8326fd05d665c (diff) | |
parent | dd634666793e51b43b703161302310326c259d50 (diff) |
Merge remote-tracking branch 'thermal/next'
Diffstat (limited to 'drivers/thermal/fair_share.c')
-rw-r--r-- | drivers/thermal/fair_share.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/thermal/fair_share.c b/drivers/thermal/fair_share.c index 944ba2f340c8..6e0a3fbfae86 100644 --- a/drivers/thermal/fair_share.c +++ b/drivers/thermal/fair_share.c @@ -23,6 +23,7 @@ */ #include <linux/thermal.h> +#include <trace/events/thermal.h> #include "thermal_core.h" @@ -34,6 +35,7 @@ static int get_trip_level(struct thermal_zone_device *tz) { int count = 0; unsigned long trip_temp; + enum thermal_trip_type trip_type; if (tz->trips == 0 || !tz->ops->get_trip_temp) return 0; @@ -43,6 +45,16 @@ static int get_trip_level(struct thermal_zone_device *tz) if (tz->temperature < trip_temp) break; } + + /* + * count > 0 only if temperature is greater than first trip + * point, in which case, trip_point = count - 1 + */ + if (count > 0) { + tz->ops->get_trip_type(tz, count - 1, &trip_type); + trace_thermal_zone_trip(tz, count - 1, trip_type); + } + return count; } |