From patchwork Tue Feb 18 11:51:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 3670211 X-Patchwork-Delegate: broonie@sirena.org.uk 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 517ADBF13A for ; Tue, 18 Feb 2014 12:57:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 60D6F201D3 for ; Tue, 18 Feb 2014 12:57:29 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 29FBB200CC for ; Tue, 18 Feb 2014 12:57:28 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 594F52659E0; Tue, 18 Feb 2014 13:57:25 +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 DE3B62656FA; Tue, 18 Feb 2014 13:21:58 +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 4778A265622; Tue, 18 Feb 2014 13:21:52 +0100 (CET) Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 7BB29265772 for ; Tue, 18 Feb 2014 12:51:52 +0100 (CET) Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id F39B8ACB9; Tue, 18 Feb 2014 11:51:51 +0000 (UTC) From: Takashi Iwai To: Mark Brown Date: Tue, 18 Feb 2014 12:51:47 +0100 Message-Id: <1392724308-13375-21-git-send-email-tiwai@suse.de> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1392724308-13375-1-git-send-email-tiwai@suse.de> References: <1392724308-13375-1-git-send-email-tiwai@suse.de> Cc: alsa-devel@alsa-project.org, Liam Girdwood Subject: [alsa-devel] [PATCH 101/102] ASoC: wm9713: Use SOC_ENUM_SINGLE_CONST() 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP ... for improving readability and maintainability. Signed-off-by: Takashi Iwai --- sound/soc/codecs/wm9713.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index acea8927905b..87a520727429 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -92,26 +92,26 @@ static const char *wm9713_mic_select[] = {"Mic 1", "Mic 2 A", "Mic 2 B"}; static const char *wm9713_micb_select[] = {"MPB", "MPA"}; static const struct soc_enum wm9713_enum[] = { -SOC_ENUM_SINGLE(AC97_LINE, 3, 4, wm9713_mic_mixer), /* record mic mixer 0 */ -SOC_ENUM_SINGLE(AC97_VIDEO, 14, 4, wm9713_rec_mux), /* record mux hp 1 */ -SOC_ENUM_SINGLE(AC97_VIDEO, 9, 4, wm9713_rec_mux), /* record mux mono 2 */ -SOC_ENUM_SINGLE(AC97_VIDEO, 3, 8, wm9713_rec_src), /* record mux left 3 */ -SOC_ENUM_SINGLE(AC97_VIDEO, 0, 8, wm9713_rec_src), /* record mux right 4*/ -SOC_ENUM_DOUBLE(AC97_CD, 14, 6, 2, wm9713_rec_gain), /* record step size 5 */ -SOC_ENUM_SINGLE(AC97_PCI_SVID, 14, 4, wm9713_alc_select), /* alc source select 6*/ -SOC_ENUM_SINGLE(AC97_REC_GAIN, 14, 4, wm9713_mono_pga), /* mono input select 7 */ -SOC_ENUM_SINGLE(AC97_REC_GAIN, 11, 8, wm9713_spk_pga), /* speaker left input select 8 */ -SOC_ENUM_SINGLE(AC97_REC_GAIN, 8, 8, wm9713_spk_pga), /* speaker right input select 9 */ -SOC_ENUM_SINGLE(AC97_REC_GAIN, 6, 3, wm9713_hp_pga), /* headphone left input 10 */ -SOC_ENUM_SINGLE(AC97_REC_GAIN, 4, 3, wm9713_hp_pga), /* headphone right input 11 */ -SOC_ENUM_SINGLE(AC97_REC_GAIN, 2, 4, wm9713_out3_pga), /* out 3 source 12 */ -SOC_ENUM_SINGLE(AC97_REC_GAIN, 0, 4, wm9713_out4_pga), /* out 4 source 13 */ -SOC_ENUM_SINGLE(AC97_REC_GAIN_MIC, 13, 8, wm9713_dac_inv), /* dac invert 1 14 */ -SOC_ENUM_SINGLE(AC97_REC_GAIN_MIC, 10, 8, wm9713_dac_inv), /* dac invert 2 15 */ -SOC_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 15, 2, wm9713_bass), /* bass control 16 */ -SOC_ENUM_SINGLE(AC97_PCI_SVID, 5, 2, wm9713_ng_type), /* noise gate type 17 */ -SOC_ENUM_SINGLE(AC97_3D_CONTROL, 12, 3, wm9713_mic_select), /* mic selection 18 */ -SOC_ENUM_SINGLE(MICB_MUX, 0, 2, wm9713_micb_select), /* mic selection 19 */ +SOC_ENUM_SINGLE_CONST(AC97_LINE, 3, wm9713_mic_mixer), /* record mic mixer 0 */ +SOC_ENUM_SINGLE_CONST(AC97_VIDEO, 14, wm9713_rec_mux), /* record mux hp 1 */ +SOC_ENUM_SINGLE_CONST(AC97_VIDEO, 9, wm9713_rec_mux), /* record mux mono 2 */ +SOC_ENUM_SINGLE_CONST(AC97_VIDEO, 3, wm9713_rec_src), /* record mux left 3 */ +SOC_ENUM_SINGLE_CONST(AC97_VIDEO, 0, wm9713_rec_src), /* record mux right 4*/ +SOC_ENUM_DOUBLE_CONST(AC97_CD, 14, 6, wm9713_rec_gain), /* record step size 5 */ +SOC_ENUM_SINGLE_CONST(AC97_PCI_SVID, 14, wm9713_alc_select), /* alc source select 6*/ +SOC_ENUM_SINGLE_CONST(AC97_REC_GAIN, 14, wm9713_mono_pga), /* mono input select 7 */ +SOC_ENUM_SINGLE_CONST(AC97_REC_GAIN, 11, wm9713_spk_pga), /* speaker left input select 8 */ +SOC_ENUM_SINGLE_CONST(AC97_REC_GAIN, 8, wm9713_spk_pga), /* speaker right input select 9 */ +SOC_ENUM_SINGLE_CONST(AC97_REC_GAIN, 6, wm9713_hp_pga), /* headphone left input 10 */ +SOC_ENUM_SINGLE_CONST(AC97_REC_GAIN, 4, wm9713_hp_pga), /* headphone right input 11 */ +SOC_ENUM_SINGLE_CONST(AC97_REC_GAIN, 2, wm9713_out3_pga), /* out 3 source 12 */ +SOC_ENUM_SINGLE_CONST(AC97_REC_GAIN, 0, wm9713_out4_pga), /* out 4 source 13 */ +SOC_ENUM_SINGLE_CONST(AC97_REC_GAIN_MIC, 13, wm9713_dac_inv), /* dac invert 1 14 */ +SOC_ENUM_SINGLE_CONST(AC97_REC_GAIN_MIC, 10, wm9713_dac_inv), /* dac invert 2 15 */ +SOC_ENUM_SINGLE_CONST(AC97_GENERAL_PURPOSE, 15, wm9713_bass), /* bass control 16 */ +SOC_ENUM_SINGLE_CONST(AC97_PCI_SVID, 5, wm9713_ng_type), /* noise gate type 17 */ +SOC_ENUM_SINGLE_CONST(AC97_3D_CONTROL, 12, wm9713_mic_select), /* mic selection 18 */ +SOC_ENUM_SINGLE_CONST(MICB_MUX, 0, wm9713_micb_select), /* mic selection 19 */ }; static const DECLARE_TLV_DB_SCALE(out_tlv, -4650, 150, 0);