From patchwork Wed Feb 24 16:38:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102688 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2508841lbl; Wed, 24 Feb 2016 08:39:18 -0800 (PST) X-Received: by 10.98.13.154 with SMTP id 26mr56055897pfn.164.1456331958261; Wed, 24 Feb 2016 08:39:18 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fk7si5907563pac.50.2016.02.24.08.39.17; Wed, 24 Feb 2016 08:39:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758238AbcBXQjP (ORCPT + 30 others); Wed, 24 Feb 2016 11:39:15 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:61600 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756929AbcBXQjI (ORCPT ); Wed, 24 Feb 2016 11:39:08 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue005) with ESMTPA (Nemesis) id 0MMJjd-1aZPoD08vl-007zUe; Wed, 24 Feb 2016 17:38:32 +0100 From: Arnd Bergmann To: Takashi Iwai Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Steven Rostedt , Ingo Molnar , Mark Brown , Lars-Peter Clausen , linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: trace: fix printing jack name Date: Wed, 24 Feb 2016 17:38:14 +0100 Message-Id: <1456331903-3999234-1-git-send-email-arnd@arndb.de> 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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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(-) -- 2.7.0 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; ),