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

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

ASoC: wm8997: Replace usage deprecated MUX/ENUM macros 



SOC_VALUE_ENUM, SND_SOC_DAPM_VALUE_MUX and SOC_DAPM_VALUE_ENUM are deprecated
and merely an alias for SOC_ENUM, 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 b8eecc19

sound/soc/codecs/wm8997.c

+6 −6
Original line number Diff line number Diff line
@@ -245,8 +245,8 @@ SND_SOC_BYTES("LHPF2 Coefficients", ARIZONA_HPLPF2_2, 1), 
SND_SOC_BYTES("LHPF3 Coefficients", ARIZONA_HPLPF3_2, 1),

SND_SOC_BYTES("LHPF4 Coefficients", ARIZONA_HPLPF4_2, 1),



SOC_VALUE_ENUM("ISRC1 FSL", arizona_isrc_fsl[0]),

SOC_VALUE_ENUM("ISRC2 FSL", arizona_isrc_fsl[1]),

SOC_VALUE("ISRC1 FSL", arizona_isrc_fsl[0]),

SOC_VALUE("ISRC2 FSL", arizona_isrc_fsl[1]),



ARIZONA_MIXER_CONTROLS("Mic", ARIZONA_MICMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("Noise", ARIZONA_NOISEMIX_INPUT_1_SOURCE),
@@ -286,8 +286,8 @@ SOC_DOUBLE_R_TLV("SPKDAT1 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_5L, 
		 ARIZONA_DAC_DIGITAL_VOLUME_5R, ARIZONA_OUT5L_VOL_SHIFT,

		 0xbf, 0, digital_tlv),



SOC_VALUE_ENUM("HPOUT1 OSR", wm8997_hpout_osr[0]),

SOC_VALUE_ENUM("EPOUT OSR", wm8997_hpout_osr[1]),

SOC_VALUE("HPOUT1 OSR", wm8997_hpout_osr[0]),

SOC_VALUE("EPOUT OSR", wm8997_hpout_osr[1]),



SOC_ENUM("Output Ramp Up", arizona_out_vi_ramp),

SOC_ENUM("Output Ramp Down", arizona_out_vd_ramp),
@@ -405,7 +405,7 @@ static const struct soc_enum wm8997_aec_loopback = 
			      wm8997_aec_loopback_values);



static const struct snd_kcontrol_new wm8997_aec_loopback_mux =

	SOC_DAPM_VALUE_ENUM("AEC Loopback", wm8997_aec_loopback);

	SOC_DAPM_ENUM("AEC Loopback", wm8997_aec_loopback);



static const struct snd_soc_dapm_widget wm8997_dapm_widgets[] = {

SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1, ARIZONA_SYSCLK_ENA_SHIFT,
@@ -604,7 +604,7 @@ SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 0, 
		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX8_ENA_SHIFT, 0),



SND_SOC_DAPM_VALUE_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,

SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,

		       ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0,

		       &wm8997_aec_loopback_mux),