aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-02-18 04:46:47 -0500
committerMark Brown <broonie@linaro.org>2014-02-22 21:43:16 -0500
commit15b49e73d375a952e34d31f7aac92944df003ca3 (patch)
tree6a9c5934897d8fc8c324799b9d2165344531d6dd /sound
parent8955f28dba9edb04305504a06d7f395ca3b32904 (diff)
ASoC: wm8995: Use SOC_ENUM_SINGLE_DECL()
Just replace with the helper macro. No functional change at all. Signed-off-by: Takashi Iwai <tiwai@suse.de> Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8995.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index 403e1db6870f..0c539bf1105c 100644
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -781,14 +781,12 @@ static const char *sidetone_text[] = {
781 "ADC/DMIC1", "DMIC2", 781 "ADC/DMIC1", "DMIC2",
782}; 782};
783 783
784static const struct soc_enum sidetone1_enum = 784static SOC_ENUM_SINGLE_DECL(sidetone1_enum, WM8995_SIDETONE, 0, sidetone_text);
785 SOC_ENUM_SINGLE(WM8995_SIDETONE, 0, 2, sidetone_text);
786 785
787static const struct snd_kcontrol_new sidetone1_mux = 786static const struct snd_kcontrol_new sidetone1_mux =
788 SOC_DAPM_ENUM("Left Sidetone Mux", sidetone1_enum); 787 SOC_DAPM_ENUM("Left Sidetone Mux", sidetone1_enum);
789 788
790static const struct soc_enum sidetone2_enum = 789static SOC_ENUM_SINGLE_DECL(sidetone2_enum, WM8995_SIDETONE, 1, sidetone_text);
791 SOC_ENUM_SINGLE(WM8995_SIDETONE, 1, 2, sidetone_text);
792 790
793static const struct snd_kcontrol_new sidetone2_mux = 791static const struct snd_kcontrol_new sidetone2_mux =
794 SOC_DAPM_ENUM("Right Sidetone Mux", sidetone2_enum); 792 SOC_DAPM_ENUM("Right Sidetone Mux", sidetone2_enum);
@@ -884,8 +882,7 @@ static const char *adc_mux_text[] = {
884 "DMIC", 882 "DMIC",
885}; 883};
886 884
887static const struct soc_enum adc_enum = 885static const SOC_ENUM_SINGLE_DECL(adc_enum, 0, 0, adc_mux_text);
888 SOC_ENUM_SINGLE(0, 0, 2, adc_mux_text);
889 886
890static const struct snd_kcontrol_new adcl_mux = 887static const struct snd_kcontrol_new adcl_mux =
891 SOC_DAPM_ENUM_VIRT("ADCL Mux", adc_enum); 888 SOC_DAPM_ENUM_VIRT("ADCL Mux", adc_enum);