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

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

ASoC: rt5640: 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 54581be7

sound/soc/codecs/rt5640.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -824,7 +824,7 @@ static SOC_VALUE_ENUM_SINGLE_DECL(rt5640_dac_l2_enum, 
				  0x3, rt5640_dac_l2_src, rt5640_dac_l2_values);

				  0x3, rt5640_dac_l2_src, rt5640_dac_l2_values);





static const struct snd_kcontrol_new rt5640_dac_l2_mux =

static const struct snd_kcontrol_new rt5640_dac_l2_mux =

	SOC_DAPM_VALUE_ENUM("DAC2 left channel source", rt5640_dac_l2_enum);

	SOC_DAPM_ENUM("DAC2 left channel source", rt5640_dac_l2_enum);





static const char * const rt5640_dac_r2_src[] = {

static const char * const rt5640_dac_r2_src[] = {

	"IF2",

	"IF2",
@@ -859,7 +859,7 @@ static SOC_VALUE_ENUM_SINGLE_DECL(rt5640_dai_iis_map_enum, 
				  rt5640_dai_iis_map_values);

				  rt5640_dai_iis_map_values);





static const struct snd_kcontrol_new rt5640_dai_mux =

static const struct snd_kcontrol_new rt5640_dai_mux =

	SOC_DAPM_VALUE_ENUM("DAI select", rt5640_dai_iis_map_enum);

	SOC_DAPM_ENUM("DAI select", rt5640_dai_iis_map_enum);





/* SDI select */

/* SDI select */

static const char * const rt5640_sdi_sel[] = {

static const char * const rt5640_sdi_sel[] = {