diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-08 08:11:44 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-08 08:11:44 -0500 |
| commit | 3ee3f454632547a8299c16156c3fefcc2a05726c (patch) | |
| tree | 82d460e48c73ffafacb07a8718c49f41f9789bbb /include/trace | |
| parent | 063e01a29b7a8a74b622dd586831e2de6cce8064 (diff) | |
| parent | 427d204c86e095bb91eb8af381bd90a48376a860 (diff) | |
Merge remote-tracking branch 'asoc/topic/cache' into asoc-next
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/asoc.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h index b04ee7e5a466..88cf39d96d0f 100644 --- a/include/trace/events/asoc.h +++ b/include/trace/events/asoc.h | |||
| @@ -288,31 +288,6 @@ TRACE_EVENT(snd_soc_jack_notify, | |||
| 288 | TP_printk("jack=%s %x", __get_str(name), (int)__entry->val) | 288 | TP_printk("jack=%s %x", __get_str(name), (int)__entry->val) |
| 289 | ); | 289 | ); |
| 290 | 290 | ||
| 291 | TRACE_EVENT(snd_soc_cache_sync, | ||
| 292 | |||
| 293 | TP_PROTO(struct snd_soc_codec *codec, const char *type, | ||
| 294 | const char *status), | ||
| 295 | |||
| 296 | TP_ARGS(codec, type, status), | ||
| 297 | |||
| 298 | TP_STRUCT__entry( | ||
| 299 | __string( name, codec->component.name) | ||
| 300 | __string( status, status ) | ||
| 301 | __string( type, type ) | ||
| 302 | __field( int, id ) | ||
| 303 | ), | ||
| 304 | |||
| 305 | TP_fast_assign( | ||
| 306 | __assign_str(name, codec->component.name); | ||
| 307 | __assign_str(status, status); | ||
| 308 | __assign_str(type, type); | ||
| 309 | __entry->id = codec->component.id; | ||
| 310 | ), | ||
| 311 | |||
| 312 | TP_printk("codec=%s.%d type=%s status=%s", __get_str(name), | ||
| 313 | (int)__entry->id, __get_str(type), __get_str(status)) | ||
| 314 | ); | ||
| 315 | |||
| 316 | #endif /* _TRACE_ASOC_H */ | 291 | #endif /* _TRACE_ASOC_H */ |
| 317 | 292 | ||
| 318 | /* This part must be outside protection */ | 293 | /* This part must be outside protection */ |
