mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 13:13:57 +08:00
ASoC: max98090: 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: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
parent
355e3a0848
commit
aae1137b99
@ -875,7 +875,7 @@ static const char *dmic_mux_text[] = { "ADC", "DMIC" };
|
||||
static SOC_ENUM_SINGLE_VIRT_DECL(dmic_mux_enum, dmic_mux_text);
|
||||
|
||||
static const struct snd_kcontrol_new max98090_dmic_mux =
|
||||
SOC_DAPM_ENUM_VIRT("DMIC Mux", dmic_mux_enum);
|
||||
SOC_DAPM_ENUM("DMIC Mux", dmic_mux_enum);
|
||||
|
||||
static const char *max98090_micpre_text[] = { "Off", "On" };
|
||||
|
||||
@ -1175,8 +1175,7 @@ static const struct snd_soc_dapm_widget max98090_dapm_widgets[] = {
|
||||
SND_SOC_DAPM_MUX("MIC2 Mux", SND_SOC_NOPM,
|
||||
0, 0, &max98090_mic2_mux),
|
||||
|
||||
SND_SOC_DAPM_VIRT_MUX("DMIC Mux", SND_SOC_NOPM,
|
||||
0, 0, &max98090_dmic_mux),
|
||||
SND_SOC_DAPM_MUX("DMIC Mux", SND_SOC_NOPM, 0, 0, &max98090_dmic_mux),
|
||||
|
||||
SND_SOC_DAPM_PGA_E("MIC1 Input", M98090_REG_MIC1_INPUT_LEVEL,
|
||||
M98090_MIC_PA1EN_SHIFT, 0, NULL, 0, max98090_micinput_event,
|
||||
|
Loading…
Reference in New Issue
Block a user