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

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

ASoC: twl6040: Use SOC_ENUM_SINGLE_DECL() 



Just replace with the helper macro.
Also, use ARRAY_SIZE() in some ASOC_ENUM_SINGLE() lines.

No functional change at all.

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

sound/soc/codecs/twl6040.c

+6 −5
Original line number Diff line number Diff line
@@ -392,8 +392,10 @@ static const char *twl6040_amicr_texts[] = 
	{"Headset Mic", "Sub Mic", "Aux/FM Right", "Off"};



static const struct soc_enum twl6040_enum[] = {

	SOC_ENUM_SINGLE(TWL6040_REG_MICLCTL, 3, 4, twl6040_amicl_texts),

	SOC_ENUM_SINGLE(TWL6040_REG_MICRCTL, 3, 4, twl6040_amicr_texts),

	SOC_ENUM_SINGLE(TWL6040_REG_MICLCTL, 3,

			ARRAY_SIZE(twl6040_amicl_texts), twl6040_amicl_texts),

	SOC_ENUM_SINGLE(TWL6040_REG_MICRCTL, 3,

			ARRAY_SIZE(twl6040_amicr_texts), twl6040_amicr_texts),

};



static const char *twl6040_hs_texts[] = {
@@ -476,8 +478,7 @@ static const char *twl6040_power_mode_texts[] = { 
	"Low-Power", "High-Performance",

};



static const struct soc_enum twl6040_power_mode_enum =

	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(twl6040_power_mode_texts),

static SOC_ENUM_SINGLE_EXT_DECL(twl6040_power_mode_enum,

				twl6040_power_mode_texts);



static int twl6040_headset_power_get_enum(struct snd_kcontrol *kcontrol,