From patchwork Tue May 27 15:46:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 4250321 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4D53C9F333 for ; Tue, 27 May 2014 16:18:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 823AB201C7 for ; Tue, 27 May 2014 16:18:22 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 6D75020176 for ; Tue, 27 May 2014 16:18:21 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 6D08726576E; Tue, 27 May 2014 18:18:20 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00, RCVD_IN_BL_SPAMCOP_NET,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 40130265898; Tue, 27 May 2014 18:04:32 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 60AE2265898; Tue, 27 May 2014 18:04:31 +0200 (CEST) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24]) by alsa0.perex.cz (Postfix) with ESMTP id C5AB12659CD for ; Tue, 27 May 2014 17:46:13 +0200 (CEST) Received: from wuerfel.localnet (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue103) with ESMTP (Nemesis) id 0LySz0-1WkFPE1o50-015oV9; Tue, 27 May 2014 17:46:06 +0200 From: Arnd Bergmann To: alsa-devel@alsa-project.org Date: Tue, 27 May 2014 17:46:05 +0200 Message-ID: <7602265.lTCp4nNe4p@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.11.0-18-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:LGzid/CIalBzWmiLs+z56mA8/iBxReaWvY7p7XKwtEs 8JNhF9BfMS36lJ3nyZyWwph8EwLDYpNfV3eLl2r/oSj3tT9ts/ HGAF6dBupp//9uMqbFMgYiFbsMGB33Z/TtiO+8UXVvvDdP4UVi x3QTufcR6uiAtc068RFwrO/Q6rHKyJVuIHVIHihFEwjPindLJV /lS+6pIvBJQz579YyZDMhbAqq4e3BTkjjRBa9fD/wy0xUJLF8p qFmWgmSiDqj3QonAm1A2k7xE2HQ/R7l34w+Y2L4yHWXDB7031I nX7l2eENB1yF8cakdCS51druynp7tStkTJ30eXRxtHee2PjIGN Tf1jm0HyLCYSlhC/Pw6M= Cc: broonie@kernel.org, Jarkko Nikula , Liam Girdwood Subject: [alsa-devel] [PATCH] ASoC: fix snd_soc_jack_add_gpiods stub X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP f025d3b9c64e1 ("ASoC: jack: Add support for GPIO descriptor defined jack pins") added this new interface, but the stub function provided for non-gpiolib builds was defined in the header file as a global function, leading to lots of "multiple definition of `snd_soc_jack_add_gpiods'" warnings. This adds the obvious "static inline" annotation. Signed-off-by: Arnd Bergmann Cc: Jarkko Nikula diff --git a/include/sound/soc.h b/include/sound/soc.h index 98dca42..559dc53 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -464,9 +464,9 @@ static inline int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, return 0; } -int snd_soc_jack_add_gpiods(struct device *gpiod_dev, - struct snd_soc_jack *jack, - int count, struct snd_soc_jack_gpio *gpios) +static inline int snd_soc_jack_add_gpiods(struct device *gpiod_dev, + struct snd_soc_jack *jack, + int count, struct snd_soc_jack_gpio *gpios) { return 0; }