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

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

ASoC: adav80x: 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 84bd1879

sound/soc/codecs/adav80x.c

+4 −4
Original line number Diff line number Diff line
@@ -172,14 +172,14 @@ static ADAV80X_MUX_ENUM_DECL(adav80x_capture_enum, ADAV80X_DPATH_CTRL1, 3); 
static ADAV80X_MUX_ENUM_DECL(adav80x_dac_enum, ADAV80X_DPATH_CTRL2, 3);



static const struct snd_kcontrol_new adav80x_aux_capture_mux_ctrl =

	SOC_DAPM_VALUE_ENUM("Route", adav80x_aux_capture_enum);

	SOC_DAPM_ENUM("Route", adav80x_aux_capture_enum);

static const struct snd_kcontrol_new adav80x_capture_mux_ctrl =

	SOC_DAPM_VALUE_ENUM("Route", adav80x_capture_enum);

	SOC_DAPM_ENUM("Route", adav80x_capture_enum);

static const struct snd_kcontrol_new adav80x_dac_mux_ctrl =

	SOC_DAPM_VALUE_ENUM("Route", adav80x_dac_enum);

	SOC_DAPM_ENUM("Route", adav80x_dac_enum);



#define ADAV80X_MUX(name, ctrl) \

	SND_SOC_DAPM_VALUE_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)

	SND_SOC_DAPM_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)



static const struct snd_soc_dapm_widget adav80x_dapm_widgets[] = {

	SND_SOC_DAPM_DAC("DAC", NULL, ADAV80X_DAC_CTRL1, 7, 1),