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 030/102] ASoC: alc5623: Use SOC_ENUM_SINGLE_DECL()
Date: Tue, 18 Feb 2014 12:37:46 +0100 [thread overview]
Message-ID: <1392723517-12772-3-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/alc5623.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c
index d3036283482a..ba61c07ebbb2 100644
--- a/sound/soc/codecs/alc5623.c
+++ b/sound/soc/codecs/alc5623.c
@@ -228,32 +228,37 @@ static const char *alc5623_aux_out_input_sel[] = {
"Vmid", "HPOut Mix", "Speaker Mix", "Mono Mix"};
/* auxout output mux */
-static const struct soc_enum alc5623_aux_out_input_enum =
-SOC_ENUM_SINGLE(ALC5623_OUTPUT_MIXER_CTRL, 6, 4, alc5623_aux_out_input_sel);
+static SOC_ENUM_SINGLE_DECL(alc5623_aux_out_input_enum,
+ ALC5623_OUTPUT_MIXER_CTRL, 6,
+ alc5623_aux_out_input_sel);
static const struct snd_kcontrol_new alc5623_auxout_mux_controls =
SOC_DAPM_ENUM("Route", alc5623_aux_out_input_enum);
/* speaker output mux */
-static const struct soc_enum alc5623_spkout_input_enum =
-SOC_ENUM_SINGLE(ALC5623_OUTPUT_MIXER_CTRL, 10, 4, alc5623_spkout_input_sel);
+static SOC_ENUM_SINGLE_DECL(alc5623_spkout_input_enum,
+ ALC5623_OUTPUT_MIXER_CTRL, 10,
+ alc5623_spkout_input_sel);
static const struct snd_kcontrol_new alc5623_spkout_mux_controls =
SOC_DAPM_ENUM("Route", alc5623_spkout_input_enum);
/* headphone left output mux */
-static const struct soc_enum alc5623_hpl_out_input_enum =
-SOC_ENUM_SINGLE(ALC5623_OUTPUT_MIXER_CTRL, 9, 2, alc5623_hpl_out_input_sel);
+static SOC_ENUM_SINGLE_DECL(alc5623_hpl_out_input_enum,
+ ALC5623_OUTPUT_MIXER_CTRL, 9,
+ alc5623_hpl_out_input_sel);
static const struct snd_kcontrol_new alc5623_hpl_out_mux_controls =
SOC_DAPM_ENUM("Route", alc5623_hpl_out_input_enum);
/* headphone right output mux */
-static const struct soc_enum alc5623_hpr_out_input_enum =
-SOC_ENUM_SINGLE(ALC5623_OUTPUT_MIXER_CTRL, 8, 2, alc5623_hpr_out_input_sel);
+static SOC_ENUM_SINGLE_DECL(alc5623_hpr_out_input_enum,
+ ALC5623_OUTPUT_MIXER_CTRL, 8,
+ alc5623_hpr_out_input_sel);
static const struct snd_kcontrol_new alc5623_hpr_out_mux_controls =
SOC_DAPM_ENUM("Route", alc5623_hpr_out_input_enum);
/* speaker output N select */
-static const struct soc_enum alc5623_spk_n_sour_enum =
-SOC_ENUM_SINGLE(ALC5623_OUTPUT_MIXER_CTRL, 14, 4, alc5623_spk_n_sour_sel);
+static SOC_ENUM_SINGLE_DECL(alc5623_spk_n_sour_enum,
+ ALC5623_OUTPUT_MIXER_CTRL, 14,
+ alc5623_spk_n_sour_sel);
static const struct snd_kcontrol_new alc5623_spkoutn_mux_controls =
SOC_DAPM_ENUM("Route", alc5623_spk_n_sour_enum);
@@ -338,8 +343,9 @@ SND_SOC_DAPM_VMID("Vmid"),
};
static const char *alc5623_amp_names[] = {"AB Amp", "D Amp"};
-static const struct soc_enum alc5623_amp_enum =
- SOC_ENUM_SINGLE(ALC5623_OUTPUT_MIXER_CTRL, 13, 2, alc5623_amp_names);
+static SOC_ENUM_SINGLE_DECL(alc5623_amp_enum,
+ ALC5623_OUTPUT_MIXER_CTRL, 13,
+ alc5623_amp_names);
static const struct snd_kcontrol_new alc5623_amp_mux_controls =
SOC_DAPM_ENUM("Route", alc5623_amp_enum);
--
1.8.5.2
next prev 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 ` Takashi Iwai [this message]
2014-02-20 2:14 ` [PATCH 030/102] ASoC: alc5623: " 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 ` [PATCH 051/102] ASoC: wm8737: " Takashi Iwai
2014-02-23 2:36 ` 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-3-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