From patchwork Tue Feb 18 11:51:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 3670221 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 1ECF1BF13A for ; Tue, 18 Feb 2014 12:58:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 249F8201D3 for ; Tue, 18 Feb 2014 12:58:08 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id F06A5200CC for ; Tue, 18 Feb 2014 12:58:06 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 168F8265A13; Tue, 18 Feb 2014 13:58:06 +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 7F37E265703; Tue, 18 Feb 2014 13:21:59 +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 65971265623; 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 7AD30265771 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 EE1C1ACB6; Tue, 18 Feb 2014 11:51:51 +0000 (UTC) From: Takashi Iwai To: Mark Brown Date: Tue, 18 Feb 2014 12:51:44 +0100 Message-Id: <1392724308-13375-18-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 098/102] ASoC: wm8971: 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/wm8971.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 67aba78a7ca5..54fda9dc434d 100644 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c @@ -113,20 +113,20 @@ static const char *wm8971_adcpol[] = {"Normal", "L Invert", "R Invert", "L + R Invert"}; static const struct soc_enum wm8971_enum[] = { - SOC_ENUM_SINGLE(WM8971_BASS, 7, 2, wm8971_bass), /* 0 */ - SOC_ENUM_SINGLE(WM8971_BASS, 6, 2, wm8971_bass_filter), - SOC_ENUM_SINGLE(WM8971_TREBLE, 6, 2, wm8971_treble), - SOC_ENUM_SINGLE(WM8971_ALC1, 7, 4, wm8971_alc_func), - SOC_ENUM_SINGLE(WM8971_NGATE, 1, 2, wm8971_ng_type), /* 4 */ - SOC_ENUM_SINGLE(WM8971_ADCDAC, 1, 4, wm8971_deemp), - SOC_ENUM_SINGLE(WM8971_ADCTL1, 4, 4, wm8971_mono_mux), - SOC_ENUM_SINGLE(WM8971_ADCTL1, 1, 2, wm8971_dac_phase), - SOC_ENUM_SINGLE(WM8971_LOUTM1, 0, 5, wm8971_lline_mux), /* 8 */ - SOC_ENUM_SINGLE(WM8971_ROUTM1, 0, 5, wm8971_rline_mux), - SOC_ENUM_SINGLE(WM8971_LADCIN, 6, 4, wm8971_lpga_sel), - SOC_ENUM_SINGLE(WM8971_RADCIN, 6, 4, wm8971_rpga_sel), - SOC_ENUM_SINGLE(WM8971_ADCDAC, 5, 4, wm8971_adcpol), /* 12 */ - SOC_ENUM_SINGLE(WM8971_ADCIN, 6, 4, wm8971_mono_mux), + SOC_ENUM_SINGLE_CONST(WM8971_BASS, 7, wm8971_bass), /* 0 */ + SOC_ENUM_SINGLE_CONST(WM8971_BASS, 6, wm8971_bass_filter), + SOC_ENUM_SINGLE_CONST(WM8971_TREBLE, 6, wm8971_treble), + SOC_ENUM_SINGLE_CONST(WM8971_ALC1, 7, wm8971_alc_func), + SOC_ENUM_SINGLE_CONST(WM8971_NGATE, 1, wm8971_ng_type), /* 4 */ + SOC_ENUM_SINGLE_CONST(WM8971_ADCDAC, 1, wm8971_deemp), + SOC_ENUM_SINGLE_CONST(WM8971_ADCTL1, 4, wm8971_mono_mux), + SOC_ENUM_SINGLE_CONST(WM8971_ADCTL1, 1, wm8971_dac_phase), + SOC_ENUM_SINGLE_CONST(WM8971_LOUTM1, 0, wm8971_lline_mux), /* 8 */ + SOC_ENUM_SINGLE_CONST(WM8971_ROUTM1, 0, wm8971_rline_mux), + SOC_ENUM_SINGLE_CONST(WM8971_LADCIN, 6, wm8971_lpga_sel), + SOC_ENUM_SINGLE_CONST(WM8971_RADCIN, 6, wm8971_rpga_sel), + SOC_ENUM_SINGLE_CONST(WM8971_ADCDAC, 5, wm8971_adcpol), /* 12 */ + SOC_ENUM_SINGLE_CONST(WM8971_ADCIN, 6, wm8971_mono_mux), }; static const struct snd_kcontrol_new wm8971_snd_controls[] = {