]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: wm5102: Replace usage deprecated MUX/ENUM macros
authorLars-Peter Clausen <lars@metafoo.de>
Mon, 14 Apr 2014 19:31:05 +0000 (21:31 +0200)
committerMark Brown <broonie@linaro.org>
Mon, 14 Apr 2014 19:40:05 +0000 (20:40 +0100)
SND_SOC_DAPM_VALUE_MUX and SOC_DAPM_VALUE_ENUM are deprecated and merely an
alias for SND_SOC_DAPM_MUX and SOC_DAPM_ENUM. Replace the deprecated macros so
we can eventually remove their definition.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/codecs/wm5102.c

index dcf1d12cfef8f7bd5cb835d995eef1cb71e1ad93..12d244b8f281c16464e8abf4651f5977643950bb 100644 (file)
@@ -970,7 +970,7 @@ static const struct soc_enum wm5102_aec_loopback =
                              wm5102_aec_loopback_values);
 
 static const struct snd_kcontrol_new wm5102_aec_loopback_mux =
-       SOC_DAPM_VALUE_ENUM("AEC Loopback", wm5102_aec_loopback);
+       SOC_DAPM_ENUM("AEC Loopback", wm5102_aec_loopback);
 
 static const struct snd_soc_dapm_widget wm5102_dapm_widgets[] = {
 SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1, ARIZONA_SYSCLK_ENA_SHIFT,
@@ -1204,7 +1204,7 @@ SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 0,
 
 ARIZONA_DSP_WIDGETS(DSP1, "DSP1"),
 
-SND_SOC_DAPM_VALUE_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
+SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
                       ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0,
                       &wm5102_aec_loopback_mux),