summaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-04 17:31:15 +0200
committerMark Brown <broonie@linaro.org>2014-08-04 17:31:15 +0200
commita1cb98ac8b6980fcd530271c739c3dd7436a91aa (patch)
tree02a084f7ccb9d80c60a99c15d66800154fed146e /include/trace
parentMerge remote-tracking branch 'asoc/fix/tlv320aic31xx' into asoc-linus (diff)
parentASoC: Add function to register component controls (diff)
downloadlinux-a1cb98ac8b6980fcd530271c739c3dd7436a91aa.tar.xz
linux-a1cb98ac8b6980fcd530271c739c3dd7436a91aa.zip
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/events/asoc.h6
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,
TP_ARGS(codec, type, status),
TP_STRUCT__entry(
- __string( name, codec->name )
+ __string( name, codec->component.name)
__string( status, status )
__string( type, type )
__field( int, id )
),
TP_fast_assign(
- __assign_str(name, codec->name);
+ __assign_str(name, codec->component.name);
__assign_str(status, status);
__assign_str(type, type);
- __entry->id = codec->id;
+ __entry->id = codec->component.id;
),
TP_printk("codec=%s.%d type=%s status=%s", __get_str(name),