ASoC: adau1373: Replace usage deprecated MUX/ENUM macros

SOC_VALUE_ENUM, SND_SOC_DAPM_VIRT_MUX and SOC_DAPM_ENUM_VIRT are deprecated and
merely an alias for SOC_ENUM, 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>

diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c
index 877f5737bb6b23bf924ab6b4a48c88f4498a950e..1ff7d4d027e932e9c20f8841bf09b89f210e6635 100644 (file)
--- a/sound/soc/codecs/adau1373.c
+++ b/sound/soc/codecs/adau1373.c
@@ -519,8 +519,7 @@ static const struct snd_kcontrol_new adau1373_controls[] = {
        SOC_ENUM("HPF Channel", adau1373_hpf_channel_enum),
 
        SOC_ENUM("Bass HPF Cutoff", adau1373_bass_hpf_cutoff_enum),
-       SOC_VALUE_ENUM("Bass Clip Level Threshold",
-           adau1373_bass_clip_level_enum),
+       SOC_ENUM("Bass Clip Level Threshold", adau1373_bass_clip_level_enum),
        SOC_ENUM("Bass LPF Cutoff", adau1373_bass_lpf_cutoff_enum),
        SOC_DOUBLE("Bass Playback Switch", ADAU1373_BASS2, 0, 1, 1, 0),
        SOC_SINGLE_TLV("Bass Playback Volume", ADAU1373_BASS2, 2, 7, 0,
@@ -580,7 +579,7 @@ static SOC_ENUM_SINGLE_VIRT_DECL(adau1373_decimator_enum,
        adau1373_decimator_text);
 
 static const struct snd_kcontrol_new adau1373_decimator_mux =
-       SOC_DAPM_ENUM_VIRT("Decimator Mux", adau1373_decimator_enum);
+       SOC_DAPM_ENUM("Decimator Mux", adau1373_decimator_enum);
 
 static const struct snd_kcontrol_new adau1373_left_adc_mixer_controls[] = {
        SOC_DAPM_SINGLE("DAC1 Switch", ADAU1373_LADC_MIXER, 4, 1, 0),
@@ -694,7 +693,7 @@ static const struct snd_soc_dapm_widget adau1373_dapm_widgets[] = {
        SND_SOC_DAPM_ADC("DMIC1", NULL, ADAU1373_DIGMICCTRL, 0, 0),
        SND_SOC_DAPM_ADC("DMIC2", NULL, ADAU1373_DIGMICCTRL, 2, 0),
 
-       SND_SOC_DAPM_VIRT_MUX("Decimator Mux", SND_SOC_NOPM, 0, 0,
+       SND_SOC_DAPM_MUX("Decimator Mux", SND_SOC_NOPM, 0, 0,
                &adau1373_decimator_mux),
 
        SND_SOC_DAPM_SUPPLY("MICBIAS2", ADAU1373_PWDN_CTRL1, 5, 0, NULL, 0),