diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-04 11:31:15 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-04 11:31:15 -0400 |
| commit | a1cb98ac8b6980fcd530271c739c3dd7436a91aa (patch) | |
| tree | 02a084f7ccb9d80c60a99c15d66800154fed146e /include/trace | |
| parent | 7c0815289113167bee2da337afa6b34e3077e4f5 (diff) | |
| parent | 0f2780ad4c2a398528c7bb1572158d6e894e5dd2 (diff) | |
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/asoc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h index c75c795a377b..0194a641e4e2 100644 --- a/include/trace/events/asoc.h +++ b/include/trace/events/asoc.h | |||
| @@ -296,17 +296,17 @@ TRACE_EVENT(snd_soc_cache_sync, | |||
| 296 | TP_ARGS(codec, type, status), | 296 | TP_ARGS(codec, type, status), |
| 297 | 297 | ||
| 298 | TP_STRUCT__entry( | 298 | TP_STRUCT__entry( |
| 299 | __string( name, codec->name ) | 299 | __string( name, codec->component.name) |
| 300 | __string( status, status ) | 300 | __string( status, status ) |
| 301 | __string( type, type ) | 301 | __string( type, type ) |
| 302 | __field( int, id ) | 302 | __field( int, id ) |
| 303 | ), | 303 | ), |
| 304 | 304 | ||
| 305 | TP_fast_assign( | 305 | TP_fast_assign( |
| 306 | __assign_str(name, codec->name); | 306 | __assign_str(name, codec->component.name); |
| 307 | __assign_str(status, status); | 307 | __assign_str(status, status); |
| 308 | __assign_str(type, type); | 308 | __assign_str(type, type); |
| 309 | __entry->id = codec->id; | 309 | __entry->id = codec->component.id; |
| 310 | ), | 310 | ), |
| 311 | 311 | ||
| 312 | TP_printk("codec=%s.%d type=%s status=%s", __get_str(name), | 312 | TP_printk("codec=%s.%d type=%s status=%s", __get_str(name), |