ASoC: wm5100: 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: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
parent
7eb364ab19
commit
cda8866952
|
@ -390,7 +390,7 @@ static int wm5100_mixer_values[] = {
|
||||||
|
|
||||||
#define WM5100_MUX_CTL_DECL(name) \
|
#define WM5100_MUX_CTL_DECL(name) \
|
||||||
const struct snd_kcontrol_new name##_mux = \
|
const struct snd_kcontrol_new name##_mux = \
|
||||||
SOC_DAPM_VALUE_ENUM("Route", name##_enum)
|
SOC_DAPM_ENUM("Route", name##_enum)
|
||||||
|
|
||||||
#define WM5100_MIXER_ENUMS(name, base_reg) \
|
#define WM5100_MIXER_ENUMS(name, base_reg) \
|
||||||
static WM5100_MUX_ENUM_DECL(name##_in1_enum, base_reg); \
|
static WM5100_MUX_ENUM_DECL(name##_in1_enum, base_reg); \
|
||||||
|
@ -448,7 +448,7 @@ WM5100_MIXER_ENUMS(LHPF3, WM5100_HPLP3MIX_INPUT_1_SOURCE);
|
||||||
WM5100_MIXER_ENUMS(LHPF4, WM5100_HPLP4MIX_INPUT_1_SOURCE);
|
WM5100_MIXER_ENUMS(LHPF4, WM5100_HPLP4MIX_INPUT_1_SOURCE);
|
||||||
|
|
||||||
#define WM5100_MUX(name, ctrl) \
|
#define WM5100_MUX(name, ctrl) \
|
||||||
SND_SOC_DAPM_VALUE_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)
|
SND_SOC_DAPM_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)
|
||||||
|
|
||||||
#define WM5100_MIXER_WIDGETS(name, name_str) \
|
#define WM5100_MIXER_WIDGETS(name, name_str) \
|
||||||
WM5100_MUX(name_str " Input 1", &name##_in1_mux), \
|
WM5100_MUX(name_str " Input 1", &name##_in1_mux), \
|
||||||
|
|
Loading…
Reference in New Issue