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

Commit af1f0a50 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files

ASoC: max98095: Use SOC_ENUM_SINGLE_DECL() 



Just replace with the helper macro.  No functional change at all.

Acked-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59

sound/soc/codecs/max98095.c

+27 −23
Original line number Diff line number Diff line
@@ -560,25 +560,27 @@ static void m98095_biquad_band(struct snd_soc_codec *codec, unsigned int dai, 
}



static const char * const max98095_fltr_mode[] = { "Voice", "Music" };

static const struct soc_enum max98095_dai1_filter_mode_enum[] = {

	SOC_ENUM_SINGLE(M98095_02E_DAI1_FILTERS, 7, 2, max98095_fltr_mode),

};

static const struct soc_enum max98095_dai2_filter_mode_enum[] = {

	SOC_ENUM_SINGLE(M98095_038_DAI2_FILTERS, 7, 2, max98095_fltr_mode),

};

static SOC_ENUM_SINGLE_DECL(max98095_dai1_filter_mode_enum,

			    M98095_02E_DAI1_FILTERS, 7,

			    max98095_fltr_mode);

static SOC_ENUM_SINGLE_DECL(max98095_dai2_filter_mode_enum,

			    M98095_038_DAI2_FILTERS, 7,

			    max98095_fltr_mode);



static const char * const max98095_extmic_text[] = { "None", "MIC1", "MIC2" };



static const struct soc_enum max98095_extmic_enum =

	SOC_ENUM_SINGLE(M98095_087_CFG_MIC, 0, 3, max98095_extmic_text);

static SOC_ENUM_SINGLE_DECL(max98095_extmic_enum,

			    M98095_087_CFG_MIC, 0,

			    max98095_extmic_text);



static const struct snd_kcontrol_new max98095_extmic_mux =

	SOC_DAPM_ENUM("External MIC Mux", max98095_extmic_enum);



static const char * const max98095_linein_text[] = { "INA", "INB" };



static const struct soc_enum max98095_linein_enum =

	SOC_ENUM_SINGLE(M98095_086_CFG_LINE, 6, 2, max98095_linein_text);

static SOC_ENUM_SINGLE_DECL(max98095_linein_enum,

			    M98095_086_CFG_LINE, 6,

			    max98095_linein_text);



static const struct snd_kcontrol_new max98095_linein_mux =

	SOC_DAPM_ENUM("Linein Input Mux", max98095_linein_enum);
@@ -586,24 +588,26 @@ static const struct snd_kcontrol_new max98095_linein_mux = 
static const char * const max98095_line_mode_text[] = {

	"Stereo", "Differential"};



static const struct soc_enum max98095_linein_mode_enum =

	SOC_ENUM_SINGLE(M98095_086_CFG_LINE, 7, 2, max98095_line_mode_text);

static SOC_ENUM_SINGLE_DECL(max98095_linein_mode_enum,

			    M98095_086_CFG_LINE, 7,

			    max98095_line_mode_text);



static const struct soc_enum max98095_lineout_mode_enum =

	SOC_ENUM_SINGLE(M98095_086_CFG_LINE, 4, 2, max98095_line_mode_text);

static SOC_ENUM_SINGLE_DECL(max98095_lineout_mode_enum,

			    M98095_086_CFG_LINE, 4,

			    max98095_line_mode_text);



static const char * const max98095_dai_fltr[] = {

	"Off", "Elliptical-HPF-16k", "Butterworth-HPF-16k",

	"Elliptical-HPF-8k", "Butterworth-HPF-8k", "Butterworth-HPF-Fs/240"};

static const struct soc_enum max98095_dai1_dac_filter_enum[] = {

	SOC_ENUM_SINGLE(M98095_02E_DAI1_FILTERS, 0, 6, max98095_dai_fltr),

};

static const struct soc_enum max98095_dai2_dac_filter_enum[] = {

	SOC_ENUM_SINGLE(M98095_038_DAI2_FILTERS, 0, 6, max98095_dai_fltr),

};

static const struct soc_enum max98095_dai3_dac_filter_enum[] = {

	SOC_ENUM_SINGLE(M98095_042_DAI3_FILTERS, 0, 6, max98095_dai_fltr),

};

static SOC_ENUM_SINGLE_DECL(max98095_dai1_dac_filter_enum,

			    M98095_02E_DAI1_FILTERS, 0,

			    max98095_dai_fltr);

static SOC_ENUM_SINGLE_DECL(max98095_dai2_dac_filter_enum,

			    M98095_038_DAI2_FILTERS, 0,

			    max98095_dai_fltr);

static SOC_ENUM_SINGLE_DECL(max98095_dai3_dac_filter_enum,

			    M98095_042_DAI3_FILTERS, 0,

			    max98095_dai_fltr);



static int max98095_mic1pre_set(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_value *ucontrol)