mirror of
https://github.com/torvalds/linux
synced 2024-10-01 17:00:41 +00:00
ASoC: wm8994: Replace usage deprecated MUX/ENUM macros
SND_SOC_DAPM_VIRT_MUX, SND_SOC_DAPM_VIRT_MUX_E and SOC_DAPM_ENUM_VIRT are deprecated and merely an alias for SND_SOC_DAPM_MUX, SND_SOC_DAPM_MUX_E 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
0a822c1e3b
commit
37d203055e
|
@ -1347,10 +1347,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 struct snd_kcontrol_new left_speaker_mixer[] = {
|
static const struct snd_kcontrol_new left_speaker_mixer[] = {
|
||||||
SOC_DAPM_SINGLE("DAC2 Switch", WM8994_SPEAKER_MIXER, 9, 1, 0),
|
SOC_DAPM_SINGLE("DAC2 Switch", WM8994_SPEAKER_MIXER, 9, 1, 0),
|
||||||
|
@ -1651,15 +1651,15 @@ SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0),
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_soc_dapm_widget wm8994_adc_revd_widgets[] = {
|
static const struct snd_soc_dapm_widget wm8994_adc_revd_widgets[] = {
|
||||||
SND_SOC_DAPM_VIRT_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux,
|
SND_SOC_DAPM_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux,
|
||||||
adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
|
adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
|
||||||
SND_SOC_DAPM_VIRT_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux,
|
SND_SOC_DAPM_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux,
|
||||||
adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
|
adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_soc_dapm_widget wm8994_adc_widgets[] = {
|
static const struct snd_soc_dapm_widget wm8994_adc_widgets[] = {
|
||||||
SND_SOC_DAPM_VIRT_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),
|
SND_SOC_DAPM_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),
|
||||||
SND_SOC_DAPM_VIRT_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),
|
SND_SOC_DAPM_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_soc_dapm_widget wm8994_dapm_widgets[] = {
|
static const struct snd_soc_dapm_widget wm8994_dapm_widgets[] = {
|
||||||
|
|
Loading…
Reference in a new issue