leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: trace: fix printing jack name

Browse Source 
After a change to the snd_jack structure, the 'name' member
is no longer available in all configurations, which results in a
build failure in the tracing code:

include/trace/events/asoc.h: In function 'trace_event_raw_event_snd_soc_jack_report':
include/trace/events/asoc.h:240:32: error: 'struct snd_jack' has no member named 'name'

The name field is normally initialized from the card shortname and
the jack "id" field:

        snprintf(jack->name, sizeof(jack->name), "%s %s",
                 card->shortname, jack->id);

This changes the tracing output to just contain the 'id' by
itself, which slightly changes the output format but avoids the
link error and is hopefully still enough to see what is going on.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: fe0d128c57 ("ALSA: jack: Allow building the jack layer without input device")
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Arnd Bergmann 2016-02-24 17:38:14 +01:00 committed by Mark Brown
parent 92e963f50f
commit f4833a519a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/trace/events/asoc.h
View File

@ -231,13 +231,13 @@ TRACE_EVENT(snd_soc_jack_report,
TP_ARGS(jack, mask, val), TP_ARGS(jack, mask, val),
TP_STRUCT__entry( TP_STRUCT__entry(
__string( name, jack->jack->name ) __string( name, jack->jack->id )
__field( int, mask ) __field( int, mask )
__field( int, val ) __field( int, val )
), ),
TP_fast_assign( TP_fast_assign(
__assign_str(name, jack->jack->name); __assign_str(name, jack->jack->id);
__entry->mask = mask; __entry->mask = mask;
__entry->val = val; __entry->val = val;
), ),
@ -253,12 +253,12 @@ TRACE_EVENT(snd_soc_jack_notify,
TP_ARGS(jack, val), TP_ARGS(jack, val),
TP_STRUCT__entry( TP_STRUCT__entry(
__string( name, jack->jack->name ) __string( name, jack->jack->id )
__field( int, val ) __field( int, val )
), ),
TP_fast_assign( TP_fast_assign(
__assign_str(name, jack->jack->name); __assign_str(name, jack->jack->id);
__entry->val = val; __entry->val = val;
), ),