Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb7d79e5 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 696d3aff

sound/soc/codecs/wm8988.c

+4 −4
Original line number Diff line number Diff line
@@ -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"};