Merge remote-tracking branches 'asoc/topic/rl6231', 'asoc/topic/rockchip', 'asoc...

[sfrench/cifs-2.6.git] / include / trace / events / asoc.h

diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
index c75c795a377b5c383b59c945c8608e4d8635da6f..0194a641e4e2589c71176fabee75c43ad1baec7d 100644 (file)
--- 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),