diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-04-14 15:31:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-14 15:40:05 -0400 |
commit | 6b2cab02a39d2d1badf93c44e989ffcb9c3c1363 (patch) | |
tree | aad0aa30322da1a83fcc80cb0340216dae98148f | |
parent | cda8866952f209d5e9de077c9ea7cb20a22e41ea (diff) |
ASoC: wm5102: Replace usage deprecated MUX/ENUM macros
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>
-rw-r--r-- | sound/soc/codecs/wm5102.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index dcf1d12cfef8..12d244b8f281 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c | |||
@@ -970,7 +970,7 @@ static const struct soc_enum wm5102_aec_loopback = | |||
970 | wm5102_aec_loopback_values); | 970 | wm5102_aec_loopback_values); |
971 | 971 | ||
972 | static const struct snd_kcontrol_new wm5102_aec_loopback_mux = | 972 | static const struct snd_kcontrol_new wm5102_aec_loopback_mux = |
973 | SOC_DAPM_VALUE_ENUM("AEC Loopback", wm5102_aec_loopback); | 973 | SOC_DAPM_ENUM("AEC Loopback", wm5102_aec_loopback); |
974 | 974 | ||
975 | static const struct snd_soc_dapm_widget wm5102_dapm_widgets[] = { | 975 | static const struct snd_soc_dapm_widget wm5102_dapm_widgets[] = { |
976 | SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1, ARIZONA_SYSCLK_ENA_SHIFT, | 976 | 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, | |||
1204 | 1204 | ||
1205 | ARIZONA_DSP_WIDGETS(DSP1, "DSP1"), | 1205 | ARIZONA_DSP_WIDGETS(DSP1, "DSP1"), |
1206 | 1206 | ||
1207 | SND_SOC_DAPM_VALUE_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1, | 1207 | SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1, |
1208 | ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, | 1208 | ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, |
1209 | &wm5102_aec_loopback_mux), | 1209 | &wm5102_aec_loopback_mux), |
1210 | 1210 | ||