diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-18 04:16:08 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-22 21:20:31 -0500 |
commit | d1755bb75c68abaa2024dc9507d1c78521adadeb (patch) | |
tree | aa6fb569d4c03bb202b8744c8a4c3afc21099bcb /sound/soc/codecs/mc13783.c | |
parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) |
ASoC: mc13783: Use SOC_ENUM_SINGLE_DECL()
Just replace with the helper macro. No functional change at all.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/mc13783.c')
-rw-r--r-- | sound/soc/codecs/mc13783.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c index 582c2bbd42cb..21c8baa2dd22 100644 --- a/sound/soc/codecs/mc13783.c +++ b/sound/soc/codecs/mc13783.c | |||
@@ -408,8 +408,8 @@ static const char * const adcl_enum_text[] = { | |||
408 | "MC1L", "RXINL", | 408 | "MC1L", "RXINL", |
409 | }; | 409 | }; |
410 | 410 | ||
411 | static const struct soc_enum adcl_enum = | 411 | static SOC_ENUM_SINGLE_DECL(adcl_enum, |
412 | SOC_ENUM_SINGLE(0, 0, ARRAY_SIZE(adcl_enum_text), adcl_enum_text); | 412 | 0, 0, adcl_enum_text); |
413 | 413 | ||
414 | static const struct snd_kcontrol_new left_input_mux = | 414 | static const struct snd_kcontrol_new left_input_mux = |
415 | SOC_DAPM_ENUM_VIRT("Route", adcl_enum); | 415 | SOC_DAPM_ENUM_VIRT("Route", adcl_enum); |
@@ -418,8 +418,8 @@ static const char * const adcr_enum_text[] = { | |||
418 | "MC1R", "MC2", "RXINR", "TXIN", | 418 | "MC1R", "MC2", "RXINR", "TXIN", |
419 | }; | 419 | }; |
420 | 420 | ||
421 | static const struct soc_enum adcr_enum = | 421 | static SOC_ENUM_SINGLE_DECL(adcr_enum, |
422 | SOC_ENUM_SINGLE(0, 0, ARRAY_SIZE(adcr_enum_text), adcr_enum_text); | 422 | 0, 0, adcr_enum_text); |
423 | 423 | ||
424 | static const struct snd_kcontrol_new right_input_mux = | 424 | static const struct snd_kcontrol_new right_input_mux = |
425 | SOC_DAPM_ENUM_VIRT("Route", adcr_enum); | 425 | SOC_DAPM_ENUM_VIRT("Route", adcr_enum); |
@@ -580,9 +580,9 @@ static struct snd_soc_dapm_route mc13783_routes[] = { | |||
580 | static const char * const mc13783_3d_mixer[] = {"Stereo", "Phase Mix", | 580 | static const char * const mc13783_3d_mixer[] = {"Stereo", "Phase Mix", |
581 | "Mono", "Mono Mix"}; | 581 | "Mono", "Mono Mix"}; |
582 | 582 | ||
583 | static const struct soc_enum mc13783_enum_3d_mixer = | 583 | static SOC_ENUM_SINGLE_DECL(mc13783_enum_3d_mixer, |
584 | SOC_ENUM_SINGLE(MC13783_AUDIO_RX1, 16, ARRAY_SIZE(mc13783_3d_mixer), | 584 | MC13783_AUDIO_RX1, 16, |
585 | mc13783_3d_mixer); | 585 | mc13783_3d_mixer); |
586 | 586 | ||
587 | static struct snd_kcontrol_new mc13783_control_list[] = { | 587 | static struct snd_kcontrol_new mc13783_control_list[] = { |
588 | SOC_SINGLE("Loudspeaker enable", MC13783_AUDIO_RX0, 5, 1, 0), | 588 | SOC_SINGLE("Loudspeaker enable", MC13783_AUDIO_RX0, 5, 1, 0), |