[PATCH] ASoC: trace: fix printing jack name

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Arnd Bergmann <arnd@arndb.de>
Newsgroups	linux.kernel
Subject	[PATCH] ASoC: trace: fix printing jack name
Date	Wed, 24 Feb 2016 17:40:02 +0100
Message-ID	<r5KDM-7ce-19@gated-at.bofh.it> (permalink)
X-Mailer	git-send-email 2.7.0
X-Provags-ID	V03:K0:gvH8nuVzU9c8JXdGKR1zA46XtxLAz+5Iy14QGYrRltZ+iquQWDD UxSSBgniCC6uBwKIICuIFlYdQxjlrMAlOb/rWdVxqhlETvVXmJDQW3MmLrBUpKxmxeBocsJ q0e3wf5UaOOcYBFzQGcky0CDFAiOAvAFRvJbYW0W+Tgg6Iiz2JCNwxXD0dRTio8zCFjMGk/ bxCz8W4V3/RjqFDiuQt7w==
X-Ui-Out-Filterresults	notjunk:1;V01:K0:9v2xJdqf5os=:NpjG3J+s2033SCkJ0RySYi r8v4w/oxzBzkuTR/AN/1h0Iwsgbk29qgqFw2RAEh8aZPreFK3PcVKKgQ94zdg6S2RHGmDjWsb aD2Z9Ru+6BD/c9O3/031xmZHLRmlOWuuL8pS3JzhS0FQcFWVa5Anz/PSprld3WMqbk675xY8o Y5ahxn6ggFs0FyxxviMyYQ5zV8R5VtYCmSu2HpigMMPS7Q175cjQeEu1dP3IOQs1D5BcWBshK dam88+hLSJAJSknOQRLNNqeCCrvBjtckkkvkSqN1IxZCTNeo97p83mZNI9b9kV4jYUCxwyE5O 9nZTRW4Vno2NsjgapHgdX2UES4BA0VM25s1xXgmN1U1pXvoXCiWJm1ckef3SlPBNwkaEuU4zL FadmQTA0dAYOCNd6UBGz25B7Gf3Sx1bSC4HXIvMeEDGp4P7ODp0TYrkJe6W2vVqmOHAqIeeoq 5attiRaHc1j1JTl3PxJ4S7RwWL/MnsXuy0os4v23XkHmbJib+82tjYBDJgWZmLXFGK2GGs5gf Ok9DdjgtClLYPE8FywxYd5jSLvbvvQWuhbFRmUhhgBex5nVgXQIfosdhq6e5CBIDy/xs7xmGp IY40oaZ5Rm1K4Cm23l2ZlL34EwIJg+zaM4HnOR033cl3lh/hOtRDJDZUywTRTLHeXnMVOL/Af rX8HW0qElmHzEaxR9inOBmi1rMzA2D/eEAfgwEHfo0APbLmxFfJsP1QJIlPmj/0pfnhc=
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	60
Organization	linux.* mail to news gateway
X-Original-Cc	linux-arm-kernel@lists.infradead.org, Arnd Bergmann <arnd@arndb.de>, Steven Rostedt <rostedt@goodmis.org>, Ingo Molnar <mingo@redhat.com>, Mark Brown <broonie@kernel.org>, Lars-Peter Clausen <lars@metafoo.de>, linux-kernel@vger.kernel.org
X-Original-Date	Wed, 24 Feb 2016 17:38:14 +0100
X-Original-Message-ID	<1456331903-3999234-1-git-send-email-arnd@arndb.de>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1342184

Show key headers only | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] ASoC: trace: fix printing jack name Arnd Bergmann <arnd@arndb.de> - 2016-02-24 17:40 +0100
  Re: [PATCH] ASoC: trace: fix printing jack name Steven Rostedt <rostedt@goodmis.org> - 2016-02-24 18:00 +0100
    Re: [PATCH] ASoC: trace: fix printing jack name Takashi Iwai <tiwai@suse.de> - 2016-02-28 09:50 +0100
      Re: [PATCH] ASoC: trace: fix printing jack name Mark Brown <broonie@kernel.org> - 2016-02-29 12:20 +0100
        Re: [PATCH] ASoC: trace: fix printing jack name Takashi Iwai <tiwai@suse.de> - 2016-02-29 13:30 +0100

csiph-web