ASoC: wm8988: 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>

diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index 3a1ae4f5164df1272a517906ed873fc7ff7b2cd0..d3fea46d58e85cb382a7c59a89361850bbd79b9f 100644 (file)
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -268,7 +268,7 @@ static const struct soc_enum wm8988_lline_enum =
                              wm8988_line_texts,
                              wm8988_line_values);
 static const struct snd_kcontrol_new wm8988_left_line_controls =
-       SOC_DAPM_VALUE_ENUM("Route", wm8988_lline_enum);
+       SOC_DAPM_ENUM("Route", wm8988_lline_enum);
 
 static const struct soc_enum wm8988_rline_enum =
        SOC_VALUE_ENUM_SINGLE(WM8988_ROUTM1, 0, 7,
@@ -276,7 +276,7 @@ static const struct soc_enum wm8988_rline_enum =
                              wm8988_line_texts,
                              wm8988_line_values);
 static const struct snd_kcontrol_new wm8988_right_line_controls =
-       SOC_DAPM_VALUE_ENUM("Route", wm8988_lline_enum);
+       SOC_DAPM_ENUM("Route", wm8988_lline_enum);
 
 /* Left Mixer */
 static const struct snd_kcontrol_new wm8988_left_mixer_controls[] = {
@@ -304,7 +304,7 @@ static const struct soc_enum wm8988_lpga_enum =
                              wm8988_pga_sel,
                              wm8988_pga_val);
 static const struct snd_kcontrol_new wm8988_left_pga_controls =
-       SOC_DAPM_VALUE_ENUM("Route", wm8988_lpga_enum);
+       SOC_DAPM_ENUM("Route", wm8988_lpga_enum);
 
 /* Right PGA Mux */
 static const struct soc_enum wm8988_rpga_enum =
@@ -313,7 +313,7 @@ static const struct soc_enum wm8988_rpga_enum =
                              wm8988_pga_sel,
                              wm8988_pga_val);
 static const struct snd_kcontrol_new wm8988_right_pga_controls =
-       SOC_DAPM_VALUE_ENUM("Route", wm8988_rpga_enum);
+       SOC_DAPM_ENUM("Route", wm8988_rpga_enum);
 
 /* Differential Mux */
 static const char *wm8988_diff_sel[] = {"Line 1", "Line 2"};