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

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

ASoC: wm8995: 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 37d20305

sound/soc/codecs/wm8995.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -885,10 +885,10 @@ static const char *adc_mux_text[] = { 
static SOC_ENUM_SINGLE_VIRT_DECL(adc_enum, adc_mux_text);

static SOC_ENUM_SINGLE_VIRT_DECL(adc_enum, adc_mux_text);





static const struct snd_kcontrol_new adcl_mux =

static const struct snd_kcontrol_new adcl_mux =

	SOC_DAPM_ENUM_VIRT("ADCL Mux", adc_enum);

	SOC_DAPM_ENUM("ADCL Mux", adc_enum);





static const struct snd_kcontrol_new adcr_mux =

static const struct snd_kcontrol_new adcr_mux =

	SOC_DAPM_ENUM_VIRT("ADCR Mux", adc_enum);

	SOC_DAPM_ENUM("ADCR Mux", adc_enum);





static const char *spk_src_text[] = {

static const char *spk_src_text[] = {

	"DAC1L", "DAC1R", "DAC2L", "DAC2R"

	"DAC1L", "DAC1R", "DAC2L", "DAC2R"
@@ -948,10 +948,8 @@ static const struct snd_soc_dapm_widget wm8995_dapm_widgets[] = { 
	SND_SOC_DAPM_AIF_OUT("AIF1ADC2R", "AIF1 Capture",

	SND_SOC_DAPM_AIF_OUT("AIF1ADC2R", "AIF1 Capture",

		0, WM8995_POWER_MANAGEMENT_3, 10, 0),

		0, WM8995_POWER_MANAGEMENT_3, 10, 0),





	SND_SOC_DAPM_VIRT_MUX("ADCL Mux", SND_SOC_NOPM, 1, 0,

	SND_SOC_DAPM_MUX("ADCL Mux", SND_SOC_NOPM, 1, 0, &adcl_mux),

		&adcl_mux),

	SND_SOC_DAPM_MUX("ADCR Mux", SND_SOC_NOPM, 0, 0, &adcr_mux),

	SND_SOC_DAPM_VIRT_MUX("ADCR Mux", SND_SOC_NOPM, 0, 0,

		&adcr_mux),





	SND_SOC_DAPM_ADC("DMIC2L", NULL, WM8995_POWER_MANAGEMENT_3, 5, 0),

	SND_SOC_DAPM_ADC("DMIC2L", NULL, WM8995_POWER_MANAGEMENT_3, 5, 0),

	SND_SOC_DAPM_ADC("DMIC2R", NULL, WM8995_POWER_MANAGEMENT_3, 4, 0),

	SND_SOC_DAPM_ADC("DMIC2R", NULL, WM8995_POWER_MANAGEMENT_3, 4, 0),