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 051/102] ASoC: wm8737: Use SOC_ENUM_SINGLE_DECL()
Date: Tue, 18 Feb 2014 12:38:07 +0100	[thread overview]
Message-ID: <1392723517-12772-24-git-send-email-tiwai@suse.de> (raw)
In-Reply-To: <1392723517-12772-2-git-send-email-tiwai@suse.de>

Just replace with the helper macro.  No functional change at all.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/soc/codecs/wm8737.c | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c
index 2f167a8ca01b..d8e50f0aaf10 100644
--- a/sound/soc/codecs/wm8737.c
+++ b/sound/soc/codecs/wm8737.c
@@ -99,29 +99,29 @@ static const char *micbias_enum_text[] = {
 	"100%",
 };
 
-static const struct soc_enum micbias_enum =
-	SOC_ENUM_SINGLE(WM8737_MIC_PREAMP_CONTROL, 0, 4, micbias_enum_text);
+static SOC_ENUM_SINGLE_DECL(micbias_enum,
+			    WM8737_MIC_PREAMP_CONTROL, 0, micbias_enum_text);
 
 static const char *low_cutoff_text[] = {
 	"Low", "High"
 };
 
-static const struct soc_enum low_3d =
-	SOC_ENUM_SINGLE(WM8737_3D_ENHANCE, 6, 2, low_cutoff_text);
+static SOC_ENUM_SINGLE_DECL(low_3d,
+			    WM8737_3D_ENHANCE, 6, low_cutoff_text);
 
 static const char *high_cutoff_text[] = {
 	"High", "Low"
 };
 
-static const struct soc_enum high_3d =
-	SOC_ENUM_SINGLE(WM8737_3D_ENHANCE, 5, 2, high_cutoff_text);
+static SOC_ENUM_SINGLE_DECL(high_3d,
+			    WM8737_3D_ENHANCE, 5, high_cutoff_text);
 
 static const char *alc_fn_text[] = {
 	"Disabled", "Right", "Left", "Stereo"
 };
 
-static const struct soc_enum alc_fn =
-	SOC_ENUM_SINGLE(WM8737_ALC1, 7, 4, alc_fn_text);
+static SOC_ENUM_SINGLE_DECL(alc_fn,
+			    WM8737_ALC1, 7, alc_fn_text);
 
 static const char *alc_hold_text[] = {
 	"0", "2.67ms", "5.33ms", "10.66ms", "21.32ms", "42.64ms", "85.28ms",
@@ -129,24 +129,24 @@ static const char *alc_hold_text[] = {
 	"10.916s", "21.832s", "43.691s"
 };
 
-static const struct soc_enum alc_hold =
-	SOC_ENUM_SINGLE(WM8737_ALC2, 0, 16, alc_hold_text);
+static SOC_ENUM_SINGLE_DECL(alc_hold,
+			    WM8737_ALC2, 0, alc_hold_text);
 
 static const char *alc_atk_text[] = {
 	"8.4ms", "16.8ms", "33.6ms", "67.2ms", "134.4ms", "268.8ms", "537.6ms",
 	"1.075s", "2.15s", "4.3s", "8.6s"
 };
 
-static const struct soc_enum alc_atk =
-	SOC_ENUM_SINGLE(WM8737_ALC3, 0, 11, alc_atk_text);
+static SOC_ENUM_SINGLE_DECL(alc_atk,
+			    WM8737_ALC3, 0, alc_atk_text);
 
 static const char *alc_dcy_text[] = {
 	"33.6ms", "67.2ms", "134.4ms", "268.8ms", "537.6ms", "1.075s", "2.15s",
 	"4.3s", "8.6s", "17.2s", "34.41s"
 };
 
-static const struct soc_enum alc_dcy =
-	SOC_ENUM_SINGLE(WM8737_ALC3, 4, 11, alc_dcy_text);
+static SOC_ENUM_SINGLE_DECL(alc_dcy,
+			    WM8737_ALC3, 4, alc_dcy_text);
 
 static const struct snd_kcontrol_new wm8737_snd_controls[] = {
 SOC_DOUBLE_R_TLV("Mic Boost Volume", WM8737_AUDIO_PATH_L, WM8737_AUDIO_PATH_R,
@@ -191,8 +191,8 @@ static const char *linsel_text[] = {
 	"LINPUT1", "LINPUT2", "LINPUT3", "LINPUT1 DC",
 };
 
-static const struct soc_enum linsel_enum =
-	SOC_ENUM_SINGLE(WM8737_AUDIO_PATH_L, 7, 4, linsel_text);
+static SOC_ENUM_SINGLE_DECL(linsel_enum,
+			    WM8737_AUDIO_PATH_L, 7, linsel_text);
 
 static const struct snd_kcontrol_new linsel_mux =
 	SOC_DAPM_ENUM("LINSEL", linsel_enum);
@@ -202,8 +202,8 @@ static const char *rinsel_text[] = {
 	"RINPUT1", "RINPUT2", "RINPUT3", "RINPUT1 DC",
 };
 
-static const struct soc_enum rinsel_enum =
-	SOC_ENUM_SINGLE(WM8737_AUDIO_PATH_R, 7, 4, rinsel_text);
+static SOC_ENUM_SINGLE_DECL(rinsel_enum,
+			    WM8737_AUDIO_PATH_R, 7, rinsel_text);
 
 static const struct snd_kcontrol_new rinsel_mux =
 	SOC_DAPM_ENUM("RINSEL", rinsel_enum);
@@ -212,15 +212,15 @@ static const char *bypass_text[] = {
 	"Direct", "Preamp"
 };
 
-static const struct soc_enum lbypass_enum =
-	SOC_ENUM_SINGLE(WM8737_MIC_PREAMP_CONTROL, 2, 2, bypass_text);
+static SOC_ENUM_SINGLE_DECL(lbypass_enum,
+			    WM8737_MIC_PREAMP_CONTROL, 2, bypass_text);
 
 static const struct snd_kcontrol_new lbypass_mux =
 	SOC_DAPM_ENUM("Left Bypass", lbypass_enum);
 
 
-static const struct soc_enum rbypass_enum =
-	SOC_ENUM_SINGLE(WM8737_MIC_PREAMP_CONTROL, 3, 2, bypass_text);
+static SOC_ENUM_SINGLE_DECL(rbypass_enum,
+			    WM8737_MIC_PREAMP_CONTROL, 3, bypass_text);
 
 static const struct snd_kcontrol_new rbypass_mux =
 	SOC_DAPM_ENUM("Left Bypass", rbypass_enum);
-- 
1.8.5.2

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

Thread overview: 110+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-18 11:37 [PATCH 029/102] ASoC: adau1373: Use SOC_ENUM_SINGLE_DECL() Takashi Iwai
2014-02-18 11:37 ` [PATCH 030/102] ASoC: alc5623: " Takashi Iwai
2014-02-20  2:14   ` Mark Brown
2014-02-18 11:37 ` [PATCH 031/102] ASoC: cs42l52: " Takashi Iwai
2014-02-20  2:15   ` Mark Brown
2014-02-18 11:37 ` [PATCH 032/102] ASoC: da7210: " Takashi Iwai
2014-02-20  2:15   ` Mark Brown
2014-02-18 11:37 ` [PATCH 033/102] ASoC: da7213: " Takashi Iwai
2014-02-20  2:16   ` Mark Brown
2014-02-18 11:37 ` [PATCH 034/102] ASoC: da9055: " Takashi Iwai
2014-02-20  2:20   ` Mark Brown
2014-02-18 11:37 ` [PATCH 035/102] ASoC: lm4857: Use SOC_ENUM_SINGLE_EXT_DECL() Takashi Iwai
2014-02-20  2:23   ` Mark Brown
2014-02-18 11:37 ` [PATCH 036/102] ASoC: da9055: Use SOC_*_ENUM_SINGLE_DECL() Takashi Iwai
2014-02-20  2:25   ` Mark Brown
2014-02-18 11:37 ` [PATCH 037/102] ASoC: max98090: Use SOC_ENUM_SINGLE_DECL() Takashi Iwai
2014-02-20  2:27   ` Mark Brown
2014-02-18 11:37 ` [PATCH 038/102] ASoC: max98095: " Takashi Iwai
2014-02-20  2:27   ` Mark Brown
2014-02-18 11:37 ` [PATCH 039/102] ASoC: mc13783: " Takashi Iwai
2014-02-23  2:20   ` Mark Brown
2014-02-18 11:37 ` [PATCH 040/102] ASoC: stl5000: " Takashi Iwai
2014-02-23  2:21   ` Mark Brown
2014-02-18 11:37 ` [PATCH 041/102] ASoC: sn95031: " Takashi Iwai
2014-02-23  2:22   ` Mark Brown
2014-02-18 11:37 ` [PATCH 042/102] ASoC: stac9766: Use SOC_ENUM_{SINGLE|DOUBLE}_DECL() Takashi Iwai
2014-02-23  2:27   ` Mark Brown
2014-02-18 11:37 ` [PATCH 043/102] ASoC: tlv320aic26: Use SOC_ENUM_SINGLE_DECL() Takashi Iwai
2014-02-23  2:28   ` Mark Brown
2014-02-18 11:38 ` [PATCH 044/102] ASoC: twl4030: " Takashi Iwai
2014-02-23  2:29   ` Mark Brown
2014-02-18 11:38 ` [PATCH 045/102] ASoC: twl6040: " Takashi Iwai
2014-02-23  2:30   ` Mark Brown
2014-02-18 11:38 ` [PATCH 046/102] ASoC: uda1380: " Takashi Iwai
2014-02-23  2:31   ` Mark Brown
2014-02-18 11:38 ` [PATCH 047/102] ASoC: wl1273: Use SOC_ENUM_SINGLE_EXT_DECL() Takashi Iwai
2014-02-23  2:32   ` Mark Brown
2014-02-18 11:38 ` [PATCH 048/102] ASoC: wm2200: Use SOC_ENUM_SINGLE_DECL() Takashi Iwai
2014-02-23  2:33   ` Mark Brown
2014-02-18 11:38 ` [PATCH 049/102] ASoC: wm8523: " Takashi Iwai
2014-02-23  2:33   ` Mark Brown
2014-02-18 11:38 ` [PATCH 050/102] ASoC: wm8731: " Takashi Iwai
2014-02-23  2:34   ` Mark Brown
2014-02-18 11:38 ` Takashi Iwai [this message]
2014-02-23  2:36   ` [PATCH 051/102] ASoC: wm8737: " Mark Brown
2014-02-18 11:38 ` [PATCH 052/102] ASoC: wm8903: " Takashi Iwai
2014-02-23  2:36   ` Mark Brown
2014-02-18 11:38 ` [PATCH 053/102] ASoC: wm8904: " Takashi Iwai
2014-02-23  2:37   ` Mark Brown
2014-02-18 11:38 ` [PATCH 054/102] ASoC: wm8940: " Takashi Iwai
2014-02-23  2:37   ` Mark Brown
2014-02-18 11:38 ` [PATCH 055/102] ASoC: wm8961: " Takashi Iwai
2014-02-23  2:38   ` Mark Brown
2014-02-18 11:38 ` [PATCH 056/102] ASoC: wm8962: " Takashi Iwai
2014-02-23  2:40   ` Mark Brown
2014-02-18 11:38 ` [PATCH 057/102] ASoC: wm8974: " Takashi Iwai
2014-02-23  2:42   ` Mark Brown
2014-02-23  2:42   ` Mark Brown
2014-02-18 11:38 ` [PATCH 058/102] ASoC: wm8993: " Takashi Iwai
2014-02-23  2:42   ` Mark Brown
2014-02-18 11:38 ` [PATCH 059/102] ASoC: wm8995: " Takashi Iwai
2014-02-23  2:44   ` Mark Brown
2014-02-18 11:38 ` [PATCH 060/102] ASoC: wm8996: " Takashi Iwai
2014-02-23  2:44   ` Mark Brown
2014-02-18 11:38 ` [PATCH 061/102] ASoC: wm_hubs: " Takashi Iwai
2014-02-23  2:44   ` Mark Brown
2014-02-18 11:38 ` [PATCH 062/102] ASoC: omap: Use SOC_ENUM_SINGLE_EXT_DECL() Takashi Iwai
2014-02-23  2:47   ` Mark Brown
2014-02-18 11:38 ` [PATCH 063/102] ASoC: 88pm860x: Use SOC_ENUM_SINGLE_DECL() Takashi Iwai
2014-02-23  2:46   ` Mark Brown
2014-02-18 11:38 ` [PATCH 064/102] ASoC: ak4641: " Takashi Iwai
2014-02-23  2:48   ` Mark Brown
2014-02-18 11:38 ` [PATCH 065/102] ASoC: ak4671: " Takashi Iwai
2014-02-23  2:49   ` Mark Brown
2014-02-18 11:38 ` [PATCH 066/102] ASoC: alc5632: " Takashi Iwai
2014-02-23  2:56   ` Mark Brown
2014-02-18 11:38 ` [PATCH 067/102] ASoC: wm2200: Use SOC_ENUM_SINGLE_*_DECL() Takashi Iwai
2014-02-23  2:57   ` Mark Brown
2014-02-18 11:38 ` [PATCH 068/102] ASoC: da732x: Use SOC_ENUM_SINGLE_DECL() Takashi Iwai
2014-02-23  2:57   ` Mark Brown
2014-02-18 11:38 ` [PATCH 069/102] ASoC: ml26124: " Takashi Iwai
2014-02-23  2:57   ` Mark Brown
2014-02-18 11:38 ` [PATCH 070/102] ASoC: tlv320aic23: " Takashi Iwai
2014-02-23  2:57   ` Mark Brown
2014-02-18 11:38 ` [PATCH 071/102] ASoC: wm5100: " Takashi Iwai
2014-02-23  3:03   ` Mark Brown
2014-02-18 11:38 ` [PATCH 072/102] ASoC: wm8955: " Takashi Iwai
2014-02-23  3:04   ` Mark Brown
2014-02-18 11:38 ` [PATCH 073/102] ASoC: wm8988: " Takashi Iwai
2014-02-23  3:04   ` Mark Brown
2014-02-18 11:38 ` [PATCH 074/102] ASoC: wm9081: " Takashi Iwai
2014-02-23  3:04   ` Mark Brown
2014-02-18 11:38 ` [PATCH 075/102] ASoC: wm9705: " Takashi Iwai
2014-02-23  3:05   ` Mark Brown
2014-02-18 11:38 ` [PATCH 076/102] ASoC: ad1836: " Takashi Iwai
2014-02-23  3:05   ` Mark Brown
2014-02-18 11:38 ` [PATCH 077/102] ASoC: cs42l73: " Takashi Iwai
2014-02-23  3:05   ` Mark Brown
2014-02-18 11:38 ` [PATCH 078/102] ASoC: lm49453: " Takashi Iwai
2014-02-23  3:05   ` Mark Brown
2014-02-18 11:38 ` [PATCH 079/102] ASoC: tlv320dac33: Use SOC_ENUM_SINGLE_*_DECL() Takashi Iwai
2014-02-23  3:06   ` Mark Brown
2014-02-18 11:38 ` [PATCH 080/102] ASoC: wm5102: Use ARRAY_SIZE() for SOC_VALUE_ENUM_SINGLE() Takashi Iwai
2014-02-23  3:06   ` Mark Brown
2014-02-18 11:38 ` [PATCH 081/102] ASoC: wm8997: " Takashi Iwai
2014-02-23  3:06   ` Mark Brown
2014-02-18 13:03 ` [PATCH 000/102 chunk#4] Clean up with SOC_ENUM_SINGLE_DECL() & co Takashi Iwai
2014-02-18 13:04 ` [PATCH 028/102] ASoC: ad193x: Use SOC_ENUM_SINGLE_DECL() Takashi Iwai
2014-02-20  1:39   ` Mark Brown
2014-02-20  2:12 ` [PATCH 029/102] ASoC: adau1373: " 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=1392723517-12772-24-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