summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-13 15:19:36 +0100
committerMark Brown <broonie@linaro.org>2014-03-13 15:19:36 +0100
commit6588fa9058f9df0687f8c3914696c40a0f235fd7 (patch)
treeb4c9f0c3cef4134c6bf29acbfd8c8551af8d6fb8 /sound
parentMerge remote-tracking branch 'asoc/topic/lm4857' into asoc-next (diff)
parentASoC: lm49453: Use SOC_ENUM_SINGLE_DECL() (diff)
downloadlinux-6588fa9058f9df0687f8c3914696c40a0f235fd7.tar.xz
linux-6588fa9058f9df0687f8c3914696c40a0f235fd7.zip
Merge remote-tracking branch 'asoc/topic/lm49453' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/lm49453.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c
index d237dd610985..275b3f72f3f4 100644
--- a/sound/soc/codecs/lm49453.c
+++ b/sound/soc/codecs/lm49453.c
@@ -213,15 +213,13 @@ static const char *lm49453_adcl_mux_text[] = { "MIC1", "Aux_L" };
static const char *lm49453_adcr_mux_text[] = { "MIC2", "Aux_R" };
-static const struct soc_enum lm49453_adcl_enum =
- SOC_ENUM_SINGLE(LM49453_P0_ANALOG_MIXER_ADC_REG, 0,
- ARRAY_SIZE(lm49453_adcl_mux_text),
- lm49453_adcl_mux_text);
-
-static const struct soc_enum lm49453_adcr_enum =
- SOC_ENUM_SINGLE(LM49453_P0_ANALOG_MIXER_ADC_REG, 1,
- ARRAY_SIZE(lm49453_adcr_mux_text),
- lm49453_adcr_mux_text);
+static SOC_ENUM_SINGLE_DECL(lm49453_adcl_enum,
+ LM49453_P0_ANALOG_MIXER_ADC_REG, 0,
+ lm49453_adcl_mux_text);
+
+static SOC_ENUM_SINGLE_DECL(lm49453_adcr_enum,
+ LM49453_P0_ANALOG_MIXER_ADC_REG, 1,
+ lm49453_adcr_mux_text);
static const struct snd_kcontrol_new lm49453_adcl_mux_control =
SOC_DAPM_ENUM("ADC Left Mux", lm49453_adcl_enum);