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

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

ASoC: mc13783: Replace usage deprecated MUX/ENUM macros 



SND_SOC_DAPM_VIRT_MUX and SOC_DAPM_ENUM_VIRT 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 aae1137b

sound/soc/codecs/mc13783.c

+4 −4
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static const char * const adcl_enum_text[] = { 
static SOC_ENUM_SINGLE_VIRT_DECL(adcl_enum, adcl_enum_text);



static const struct snd_kcontrol_new left_input_mux =

	SOC_DAPM_ENUM_VIRT("Route", adcl_enum);

	SOC_DAPM_ENUM("Route", adcl_enum);



static const char * const adcr_enum_text[] = {

	"MC1R", "MC2", "RXINR", "TXIN",
@@ -418,7 +418,7 @@ static const char * const adcr_enum_text[] = { 
static SOC_ENUM_SINGLE_VIRT_DECL(adcr_enum, adcr_enum_text);



static const struct snd_kcontrol_new right_input_mux =

	SOC_DAPM_ENUM_VIRT("Route", adcr_enum);

	SOC_DAPM_ENUM("Route", adcr_enum);



static const struct snd_kcontrol_new samp_ctl =

	SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 3, 1, 0);
@@ -478,9 +478,9 @@ static const struct snd_soc_dapm_widget mc13783_dapm_widgets[] = { 
	SND_SOC_DAPM_SWITCH("MC2 Amp", MC13783_AUDIO_TX, 9, 0, &mc2_amp_ctl),

	SND_SOC_DAPM_SWITCH("TXIN Amp", MC13783_AUDIO_TX, 11, 0, &atx_amp_ctl),



	SND_SOC_DAPM_VIRT_MUX("PGA Left Input Mux", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_MUX("PGA Left Input Mux", SND_SOC_NOPM, 0, 0,

			      &left_input_mux),

	SND_SOC_DAPM_VIRT_MUX("PGA Right Input Mux", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_MUX("PGA Right Input Mux", SND_SOC_NOPM, 0, 0,

			      &right_input_mux),



	SND_SOC_DAPM_MUX("Speaker Amp Source MUX", SND_SOC_NOPM, 0, 0,