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

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

ASoC: tlv320dac33: Use SOC_ENUM_SINGLE_*_DECL() 



Just replace with the helper macros.  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/tlv320dac33.c

+13 −19
Original line number Original line Diff line number Diff line
@@ -478,9 +478,7 @@ static const char *dac33_fifo_mode_texts[] = { 
	"Bypass", "Mode 1", "Mode 7"

	"Bypass", "Mode 1", "Mode 7"

};

};





static const struct soc_enum dac33_fifo_mode_enum =

static SOC_ENUM_SINGLE_EXT_DECL(dac33_fifo_mode_enum, dac33_fifo_mode_texts);

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(dac33_fifo_mode_texts),

			    dac33_fifo_mode_texts);





/* L/R Line Output Gain */

/* L/R Line Output Gain */

static const char *lr_lineout_gain_texts[] = {

static const char *lr_lineout_gain_texts[] = {
@@ -488,14 +486,12 @@ static const char *lr_lineout_gain_texts[] = { 
	"Line 0dB DAC 12dB", "Line 6dB DAC 18dB",

	"Line 0dB DAC 12dB", "Line 6dB DAC 18dB",

};

};





static const struct soc_enum l_lineout_gain_enum =

static SOC_ENUM_SINGLE_DECL(l_lineout_gain_enum,

	SOC_ENUM_SINGLE(DAC33_LDAC_PWR_CTRL, 0,

			    DAC33_LDAC_PWR_CTRL, 0,

			ARRAY_SIZE(lr_lineout_gain_texts),

			    lr_lineout_gain_texts);

			    lr_lineout_gain_texts);





static const struct soc_enum r_lineout_gain_enum =

static SOC_ENUM_SINGLE_DECL(r_lineout_gain_enum,

	SOC_ENUM_SINGLE(DAC33_RDAC_PWR_CTRL, 0,

			    DAC33_RDAC_PWR_CTRL, 0,

			ARRAY_SIZE(lr_lineout_gain_texts),

			    lr_lineout_gain_texts);

			    lr_lineout_gain_texts);





/*

/*
@@ -534,17 +530,15 @@ static const struct snd_kcontrol_new dac33_dapm_abypassr_control = 
/* LOP L/R invert selection */

/* LOP L/R invert selection */

static const char *dac33_lr_lom_texts[] = {"DAC", "LOP"};

static const char *dac33_lr_lom_texts[] = {"DAC", "LOP"};





static const struct soc_enum dac33_left_lom_enum =

static SOC_ENUM_SINGLE_DECL(dac33_left_lom_enum,

	SOC_ENUM_SINGLE(DAC33_OUT_AMP_CTRL, 3,

			    DAC33_OUT_AMP_CTRL, 3,

			ARRAY_SIZE(dac33_lr_lom_texts),

			    dac33_lr_lom_texts);

			    dac33_lr_lom_texts);





static const struct snd_kcontrol_new dac33_dapm_left_lom_control =

static const struct snd_kcontrol_new dac33_dapm_left_lom_control =

SOC_DAPM_ENUM("Route", dac33_left_lom_enum);

SOC_DAPM_ENUM("Route", dac33_left_lom_enum);





static const struct soc_enum dac33_right_lom_enum =

static SOC_ENUM_SINGLE_DECL(dac33_right_lom_enum,

	SOC_ENUM_SINGLE(DAC33_OUT_AMP_CTRL, 2,

			    DAC33_OUT_AMP_CTRL, 2,

			ARRAY_SIZE(dac33_lr_lom_texts),

			    dac33_lr_lom_texts);

			    dac33_lr_lom_texts);





static const struct snd_kcontrol_new dac33_dapm_right_lom_control =

static const struct snd_kcontrol_new dac33_dapm_right_lom_control =