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

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

ASoC: arizona: 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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 48fa3636

sound/soc/codecs/arizona.h

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS]; 


#define ARIZONA_MUX_CTL_DECL(name) \

	const struct snd_kcontrol_new name##_mux =	\

		SOC_DAPM_VALUE_ENUM("Route", name##_enum)

		SOC_DAPM_ENUM("Route", name##_enum)



#define ARIZONA_MUX_ENUMS(name, base_reg) \

	static ARIZONA_MUX_ENUM_DECL(name##_enum, base_reg);      \
@@ -128,7 +128,7 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS]; 
	ARIZONA_MUX_ENUMS(name##_aux6, base_reg + 40)



#define ARIZONA_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 ARIZONA_MUX_WIDGETS(name, name_str) \

	ARIZONA_MUX(name_str " Input", &name##_mux)