From patchwork Fri Feb 28 07:31:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Peter Clausen X-Patchwork-Id: 3739281 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B68B6BF13A for ; Fri, 28 Feb 2014 07:47:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DB2212022D for ; Fri, 28 Feb 2014 07:47:37 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id AE0DF20219 for ; Fri, 28 Feb 2014 07:47:36 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id C3387265B74; Fri, 28 Feb 2014 08:47:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 6092D26591D; Fri, 28 Feb 2014 08:39:26 +0100 (CET) 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 5B2F526594A; Fri, 28 Feb 2014 08:39:25 +0100 (CET) Received: from smtp-out-167.synserver.de (smtp-out-127.synserver.de [212.40.185.127]) by alsa0.perex.cz (Postfix) with ESMTP id 37BF926591D for ; Fri, 28 Feb 2014 08:30:55 +0100 (CET) Received: (qmail 20388 invoked by uid 0); 28 Feb 2014 07:30:52 -0000 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: lars@metafoo.de X-SynServer-PPID: 19716 Received: from ppp-46-244-145-28.dynamic.mnet-online.de (HELO lars-adi-laptop.fritz.box) [46.244.145.28] by 217.119.54.96 with SMTP; 28 Feb 2014 07:30:52 -0000 From: Lars-Peter Clausen To: Mark Brown , Liam Girdwood Date: Fri, 28 Feb 2014 08:31:08 +0100 Message-Id: <1393572672-13937-8-git-send-email-lars@metafoo.de> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1393572672-13937-1-git-send-email-lars@metafoo.de> References: <1393572672-13937-1-git-send-email-lars@metafoo.de> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Lars-Peter Clausen , patches@opensource.wolfsonmicro.com, =?UTF-8?q?Philippe=20R=C3=A9tornaz?= , Charles Keepax , Steffen Trumtrar Subject: [alsa-devel] [PATCH v2 07/11] ASoC: mc13783: Use SOC_ENUM_SINGLE_VIRT_DECL() 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 For the upcoming consolidation for MUXs and virtual MUXs we need to mark virtual enums as such. Signed-off-by: Lars-Peter Clausen Tested-by: Philippe Rétornaz --- No changes since v1 --- sound/soc/codecs/mc13783.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c index c605036..ec89b8f 100644 --- a/sound/soc/codecs/mc13783.c +++ b/sound/soc/codecs/mc13783.c @@ -408,8 +408,7 @@ static const char * const adcl_enum_text[] = { "MC1L", "RXINL", }; -static SOC_ENUM_SINGLE_DECL(adcl_enum, - 0, 0, adcl_enum_text); +static SOC_ENUM_SINGLE_VIRT_DECL(adcl_enum, adcl_enum_text); static const struct snd_kcontrol_new left_input_mux = SOC_DAPM_ENUM_VIRT("Route", adcl_enum); @@ -418,8 +417,7 @@ static const char * const adcr_enum_text[] = { "MC1R", "MC2", "RXINR", "TXIN", }; -static SOC_ENUM_SINGLE_DECL(adcr_enum, - 0, 0, adcr_enum_text); +static SOC_ENUM_SINGLE_VIRT_DECL(adcr_enum, adcr_enum_text); static const struct snd_kcontrol_new right_input_mux = SOC_DAPM_ENUM_VIRT("Route", adcr_enum);