Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org, Liam Girdwood <lgirdwood@gmail.com>
Subject: [PATCH 101/102] ASoC: wm9713: Use SOC_ENUM_SINGLE_CONST()
Date: Tue, 18 Feb 2014 12:51:47 +0100	[thread overview]
Message-ID: <1392724308-13375-21-git-send-email-tiwai@suse.de> (raw)
In-Reply-To: <1392724308-13375-1-git-send-email-tiwai@suse.de>

... for improving readability and maintainability.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 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);
-- 
1.8.5.2

  parent reply	other threads:[~2014-02-18 11:51 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-18 11:51 [PATCH 000/102 - chunk#5] Add SOC_ENUM_SINGLE_CONST() & co Takashi Iwai
2014-02-18 11:51 ` [PATCH 082/102] ASoC: Add SOC_ENUM_SINGLE_CONST() and SOC_ENUM_DOUBLE_CONST() macros Takashi Iwai
2014-02-20  2:33   ` Mark Brown
2014-02-20  7:08     ` Takashi Iwai
2014-02-20  7:50       ` Takashi Iwai
2014-02-20  9:09       ` Mark Brown
2014-02-20 14:56         ` Takashi Iwai
2014-02-20 23:34           ` Mark Brown
2014-02-18 11:51 ` [PATCH 083/102] ASoC: ak4535: Use SOC_ENUM_SINGLE_CONST() Takashi Iwai
2014-02-18 11:51 ` [PATCH 084/102] ASoC: arizona: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 085/102] ASoC: isabelle: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 086/102] ASoC: max9877: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 087/102] ASoC: ssm2602: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 088/102] ASoC: tas5086: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 089/102] ASoC: tlv320aic3x: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 090/102] ASoC: twl6040: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 091/102] ASoC: uad134x: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 092/102] ASoC: uad1380: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 093/102] ASoC: wm8350: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 094/102] ASoC: wm8510: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 095/102] ASoC: wm8750: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 096/102] ASoC: wm8753: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 097/102] ASoC: wm8960: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 098/102] ASoC: wm8971: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 099/102] ASoC: wm8974: " Takashi Iwai
2014-02-18 11:51 ` [PATCH 100/102] ASoC: wm9712: " Takashi Iwai
2014-02-18 11:51 ` Takashi Iwai [this message]
2014-02-18 11:51 ` [PATCH 102/102] ASoC: wm_adsp: " Takashi Iwai
2014-02-19  1:43 ` [PATCH 000/102 - chunk#5] Add SOC_ENUM_SINGLE_CONST() & co Mark Brown
2014-02-19  6:48   ` Takashi Iwai
2014-02-19  8:00     ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392724308-13375-21-git-send-email-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox