From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757746AbcBXQun (ORCPT ); Wed, 24 Feb 2016 11:50:43 -0500 Received: from smtprelay0021.hostedemail.com ([216.40.44.21]:42871 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753926AbcBXQum (ORCPT ); Wed, 24 Feb 2016 11:50:42 -0500 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::::,RULES_HIT:41:355:379:541:599:800:960:988:989:1260:1277:1311:1313:1314:1345:1359:1431:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2198:2199:2393:2553:2559:2562:2899:2902:3138:3139:3140:3141:3142:3354:3622:3865:3867:3868:3870:3871:4384:4605:5007:6261:7875:10004:10400:10848:10967:11026:11232:11473:11658:11914:12043:12295:12296:12438:12517:12519:12555:12740:13138:13161:13229:13231:14093:14096:14097:14659:21080:30009:30012:30029:30054:30070:30080:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:3,LUA_SUMMARY:none X-HE-Tag: beam29_5cf9470a3da1e X-Filterd-Recvd-Size: 3387 Date: Wed, 24 Feb 2016 11:50:37 -0500 From: Steven Rostedt To: Arnd Bergmann Cc: Takashi Iwai , linux-arm-kernel@lists.infradead.org, Ingo Molnar , Mark Brown , Lars-Peter Clausen , linux-kernel@vger.kernel.org Subject: Re: [PATCH] ASoC: trace: fix printing jack name Message-ID: <20160224115037.40772a90@gandalf.local.home> In-Reply-To: <1456331903-3999234-1-git-send-email-arnd@arndb.de> References: <1456331903-3999234-1-git-send-email-arnd@arndb.de> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 24 Feb 2016 17:38:14 +0100 Arnd Bergmann 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 > 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; > ), >