projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/max98926', 'asoc/topic/mtk', 'asoc/topic...
[linux-2.6-block.git]
/
include
/
trace
/
events
/
asoc.h
diff --git
a/include/trace/events/asoc.h
b/include/trace/events/asoc.h
index 317a1ed2f4acc7745c3e02955c60e8c1dc8eb7c3..9130dd5a184a25e7d6c6cf0b633d7d5c0c4fc0f6 100644
(file)
--- a/
include/trace/events/asoc.h
+++ b/
include/trace/events/asoc.h
@@
-231,13
+231,13
@@
TRACE_EVENT(snd_soc_jack_report,
TP_ARGS(jack, mask, val),
TP_STRUCT__entry(
TP_ARGS(jack, mask, val),
TP_STRUCT__entry(
- __string( name, jack->jack->
name
)
+ __string( name, jack->jack->
id
)
__field( int, mask )
__field( int, val )
),
TP_fast_assign(
__field( int, mask )
__field( int, val )
),
TP_fast_assign(
- __assign_str(name, jack->jack->
name
);
+ __assign_str(name, jack->jack->
id
);
__entry->mask = mask;
__entry->val = val;
),
__entry->mask = mask;
__entry->val = val;
),
@@
-253,12
+253,12
@@
TRACE_EVENT(snd_soc_jack_notify,
TP_ARGS(jack, val),
TP_STRUCT__entry(
TP_ARGS(jack, val),
TP_STRUCT__entry(
- __string( name, jack->jack->
name
)
+ __string( name, jack->jack->
id
)
__field( int, val )
),
TP_fast_assign(
__field( int, val )
),
TP_fast_assign(
- __assign_str(name, jack->jack->
name
);
+ __assign_str(name, jack->jack->
id
);
__entry->val = val;
),
__entry->val = val;
),