diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 12:20:28 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 03:13:59 -0400 |
commit | 9502272163ace71d77d809937216fd669c02364b (patch) | |
tree | b2dea596d45696624e8027ed676228951eb4d50a /sound/ppc | |
parent | 9883ab91e3ba5229bfe2d6e7f6ff497a2d03d4d2 (diff) |
ALSA: ppc: Use snd_ctl_enum_info()
... and reduce the open codes. Also add missing const to the text array.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/ppc')
-rw-r--r-- | sound/ppc/tumbler.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index b9ffc17a4799..24c8766a925d 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c | |||
@@ -795,16 +795,11 @@ static int snapper_set_capture_source(struct pmac_tumbler *mix) | |||
795 | static int snapper_info_capture_source(struct snd_kcontrol *kcontrol, | 795 | static int snapper_info_capture_source(struct snd_kcontrol *kcontrol, |
796 | struct snd_ctl_elem_info *uinfo) | 796 | struct snd_ctl_elem_info *uinfo) |
797 | { | 797 | { |
798 | static char *texts[2] = { | 798 | static const char * const texts[2] = { |
799 | "Line", "Mic" | 799 | "Line", "Mic" |
800 | }; | 800 | }; |
801 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | 801 | |
802 | uinfo->count = 1; | 802 | return snd_ctl_enum_info(uinfo, 1, 2, texts); |
803 | uinfo->value.enumerated.items = 2; | ||
804 | if (uinfo->value.enumerated.item > 1) | ||
805 | uinfo->value.enumerated.item = 1; | ||
806 | strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); | ||
807 | return 0; | ||
808 | } | 803 | } |
809 | 804 | ||
810 | static int snapper_get_capture_source(struct snd_kcontrol *kcontrol, | 805 | static int snapper_get_capture_source(struct snd_kcontrol *kcontrol, |