aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/thermal/devfreq_cooling.c2
-rw-r--r--include/trace/events/thermal.h11
2 files changed, 8 insertions, 5 deletions
diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c
index 26c31571a12c..ef59256887ff 100644
--- a/drivers/thermal/devfreq_cooling.c
+++ b/drivers/thermal/devfreq_cooling.c
@@ -321,7 +321,7 @@ static int devfreq_cooling_get_requested_power(struct thermal_cooling_device *cd
321 } 321 }
322 322
323 trace_thermal_power_devfreq_get_power(cdev, status, freq, dyn_power, 323 trace_thermal_power_devfreq_get_power(cdev, status, freq, dyn_power,
324 static_power); 324 static_power, *power);
325 325
326 return 0; 326 return 0;
327fail: 327fail:
diff --git a/include/trace/events/thermal.h b/include/trace/events/thermal.h
index 2b4a8ff72d0d..6cde5b3514c2 100644
--- a/include/trace/events/thermal.h
+++ b/include/trace/events/thermal.h
@@ -151,9 +151,9 @@ TRACE_EVENT(thermal_power_cpu_limit,
151TRACE_EVENT(thermal_power_devfreq_get_power, 151TRACE_EVENT(thermal_power_devfreq_get_power,
152 TP_PROTO(struct thermal_cooling_device *cdev, 152 TP_PROTO(struct thermal_cooling_device *cdev,
153 struct devfreq_dev_status *status, unsigned long freq, 153 struct devfreq_dev_status *status, unsigned long freq,
154 u32 dynamic_power, u32 static_power), 154 u32 dynamic_power, u32 static_power, u32 power),
155 155
156 TP_ARGS(cdev, status, freq, dynamic_power, static_power), 156 TP_ARGS(cdev, status, freq, dynamic_power, static_power, power),
157 157
158 TP_STRUCT__entry( 158 TP_STRUCT__entry(
159 __string(type, cdev->type ) 159 __string(type, cdev->type )
@@ -161,6 +161,7 @@ TRACE_EVENT(thermal_power_devfreq_get_power,
161 __field(u32, load ) 161 __field(u32, load )
162 __field(u32, dynamic_power ) 162 __field(u32, dynamic_power )
163 __field(u32, static_power ) 163 __field(u32, static_power )
164 __field(u32, power)
164 ), 165 ),
165 166
166 TP_fast_assign( 167 TP_fast_assign(
@@ -169,11 +170,13 @@ TRACE_EVENT(thermal_power_devfreq_get_power,
169 __entry->load = (100 * status->busy_time) / status->total_time; 170 __entry->load = (100 * status->busy_time) / status->total_time;
170 __entry->dynamic_power = dynamic_power; 171 __entry->dynamic_power = dynamic_power;
171 __entry->static_power = static_power; 172 __entry->static_power = static_power;
173 __entry->power = power;
172 ), 174 ),
173 175
174 TP_printk("type=%s freq=%lu load=%u dynamic_power=%u static_power=%u", 176 TP_printk("type=%s freq=%lu load=%u dynamic_power=%u static_power=%u power=%u",
175 __get_str(type), __entry->freq, 177 __get_str(type), __entry->freq,
176 __entry->load, __entry->dynamic_power, __entry->static_power) 178 __entry->load, __entry->dynamic_power, __entry->static_power,
179 __entry->power)
177); 180);
178 181
179TRACE_EVENT(thermal_power_devfreq_limit, 182TRACE_EVENT(thermal_power_devfreq_limit,