* [PATCH] ASoC: trace: fix printing jack name
@ 2016-02-24 16:38 Arnd Bergmann
2016-02-24 16:50 ` Steven Rostedt
0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2016-02-24 16:38 UTC (permalink / raw)
To: Takashi Iwai
Cc: linux-arm-kernel, Arnd Bergmann, Steven Rostedt, Ingo Molnar,
Mark Brown, Lars-Peter Clausen, linux-kernel
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: fe0d128c57bf ("ALSA: jack: Allow building the jack layer without input device")
---
include/trace/events/asoc.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
index 317a1ed2f4ac..9130dd5a184a 100644
--- 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(
- __string( name, jack->jack->name )
+ __string( name, jack->jack->id )
__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;
),
@@ -253,12 +253,12 @@ TRACE_EVENT(snd_soc_jack_notify,
TP_ARGS(jack, val),
TP_STRUCT__entry(
- __string( name, jack->jack->name )
+ __string( name, jack->jack->id )
__field( int, val )
),
TP_fast_assign(
- __assign_str(name, jack->jack->name);
+ __assign_str(name, jack->jack->id);
__entry->val = val;
),
--
2.7.0
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ASoC: trace: fix printing jack name
2016-02-24 16:38 [PATCH] ASoC: trace: fix printing jack name Arnd Bergmann
@ 2016-02-24 16:50 ` Steven Rostedt
2016-02-28 8:48 ` Takashi Iwai
0 siblings, 1 reply; 5+ messages in thread
From: Steven Rostedt @ 2016-02-24 16:50 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Takashi Iwai, linux-arm-kernel, Ingo Molnar, Mark Brown,
Lars-Peter Clausen, linux-kernel
On Wed, 24 Feb 2016 17:38:14 +0100
Arnd Bergmann <arnd@arndb.de> wrote:
> 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.
If people would like name if available, we could do:
#ifdef CONFIG_SND_JACK_INPUT_DEV
# define JACK_NAME(jk) (jk)->jack->name
#else
# define JACK_NAME(jk) (jk)->jack->id
#endif
And then below have:
__string( name, JACK_NAME(jack) )
The #ifdef can stay in the events/asoc.h file.
-- Steve
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: fe0d128c57bf ("ALSA: jack: Allow building the jack layer without input device")
> ---
> include/trace/events/asoc.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
> index 317a1ed2f4ac..9130dd5a184a 100644
> --- 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(
> - __string( name, jack->jack->name )
> + __string( name, jack->jack->id )
> __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;
> ),
> @@ -253,12 +253,12 @@ TRACE_EVENT(snd_soc_jack_notify,
> TP_ARGS(jack, val),
>
> TP_STRUCT__entry(
> - __string( name, jack->jack->name )
> + __string( name, jack->jack->id )
> __field( int, val )
> ),
>
> TP_fast_assign(
> - __assign_str(name, jack->jack->name);
> + __assign_str(name, jack->jack->id);
> __entry->val = val;
> ),
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ASoC: trace: fix printing jack name
2016-02-24 16:50 ` Steven Rostedt
@ 2016-02-28 8:48 ` Takashi Iwai
2016-02-29 11:13 ` Mark Brown
0 siblings, 1 reply; 5+ messages in thread
From: Takashi Iwai @ 2016-02-28 8:48 UTC (permalink / raw)
To: Steven Rostedt
Cc: Arnd Bergmann, linux-arm-kernel, Ingo Molnar, Mark Brown,
Lars-Peter Clausen, linux-kernel
On Wed, 24 Feb 2016 17:50:37 +0100,
Steven Rostedt wrote:
>
> On Wed, 24 Feb 2016 17:38:14 +0100
> Arnd Bergmann <arnd@arndb.de> wrote:
>
> > 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.
>
> If people would like name if available, we could do:
>
> #ifdef CONFIG_SND_JACK_INPUT_DEV
> # define JACK_NAME(jk) (jk)->jack->name
> #else
> # define JACK_NAME(jk) (jk)->jack->id
> #endif
>
> And then below have:
>
> __string( name, JACK_NAME(jack) )
>
>
> The #ifdef can stay in the events/asoc.h file.
I don't mind either way. Mark, what do you think?
In anyway, the breakage came from my tree, so I'm going to apply the
fix directly on mine.
thanks,
Takashi
>
> -- Steve
>
>
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Fixes: fe0d128c57bf ("ALSA: jack: Allow building the jack layer without input device")
> > ---
> > include/trace/events/asoc.h | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
> > index 317a1ed2f4ac..9130dd5a184a 100644
> > --- 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(
> > - __string( name, jack->jack->name )
> > + __string( name, jack->jack->id )
> > __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;
> > ),
> > @@ -253,12 +253,12 @@ TRACE_EVENT(snd_soc_jack_notify,
> > TP_ARGS(jack, val),
> >
> > TP_STRUCT__entry(
> > - __string( name, jack->jack->name )
> > + __string( name, jack->jack->id )
> > __field( int, val )
> > ),
> >
> > TP_fast_assign(
> > - __assign_str(name, jack->jack->name);
> > + __assign_str(name, jack->jack->id);
> > __entry->val = val;
> > ),
> >
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ASoC: trace: fix printing jack name
2016-02-28 8:48 ` Takashi Iwai
@ 2016-02-29 11:13 ` Mark Brown
2016-02-29 12:23 ` Takashi Iwai
0 siblings, 1 reply; 5+ messages in thread
From: Mark Brown @ 2016-02-29 11:13 UTC (permalink / raw)
To: Takashi Iwai
Cc: Steven Rostedt, Arnd Bergmann, linux-arm-kernel, Ingo Molnar,
Lars-Peter Clausen, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
On Sun, Feb 28, 2016 at 09:48:39AM +0100, Takashi Iwai wrote:
> In anyway, the breakage came from my tree, so I'm going to apply the
> fix directly on mine.
I applied it to ASoC a few days ago.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ASoC: trace: fix printing jack name
2016-02-29 11:13 ` Mark Brown
@ 2016-02-29 12:23 ` Takashi Iwai
0 siblings, 0 replies; 5+ messages in thread
From: Takashi Iwai @ 2016-02-29 12:23 UTC (permalink / raw)
To: Mark Brown
Cc: Steven Rostedt, Arnd Bergmann, linux-arm-kernel, Ingo Molnar,
Lars-Peter Clausen, linux-kernel
On Mon, 29 Feb 2016 12:13:59 +0100,
Mark Brown wrote:
>
> On Sun, Feb 28, 2016 at 09:48:39AM +0100, Takashi Iwai wrote:
>
> > In anyway, the breakage came from my tree, so I'm going to apply the
> > fix directly on mine.
>
> I applied it to ASoC a few days ago.
Ah, OK, I didn't notice it. Thanks.
Takashi
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-02-29 12:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-24 16:38 [PATCH] ASoC: trace: fix printing jack name Arnd Bergmann
2016-02-24 16:50 ` Steven Rostedt
2016-02-28 8:48 ` Takashi Iwai
2016-02-29 11:13 ` Mark Brown
2016-02-29 12:23 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®