diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 12:15:26 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 02:37:36 -0400 |
commit | 3c6a73cc6b6ccd9188b3405c744365c0874b9274 (patch) | |
tree | 52616176469a5fcf355b77c9311604d1c0cd9e46 /sound/parisc | |
parent | 2a2085ab198439c8f08be2f6b9b5cbc9e93877b7 (diff) |
ALSA: parisc: 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/parisc')
-rw-r--r-- | sound/parisc/harmony.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index 4b20be79c1dd..29604a239c44 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c | |||
@@ -776,15 +776,9 @@ static int | |||
776 | snd_harmony_captureroute_info(struct snd_kcontrol *kc, | 776 | snd_harmony_captureroute_info(struct snd_kcontrol *kc, |
777 | struct snd_ctl_elem_info *uinfo) | 777 | struct snd_ctl_elem_info *uinfo) |
778 | { | 778 | { |
779 | static char *texts[2] = { "Line", "Mic" }; | 779 | static const char * const texts[2] = { "Line", "Mic" }; |
780 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | 780 | |
781 | uinfo->count = 1; | 781 | return snd_ctl_enum_info(uinfo, 1, 2, texts); |
782 | uinfo->value.enumerated.items = 2; | ||
783 | if (uinfo->value.enumerated.item > 1) | ||
784 | uinfo->value.enumerated.item = 1; | ||
785 | strcpy(uinfo->value.enumerated.name, | ||
786 | texts[uinfo->value.enumerated.item]); | ||
787 | return 0; | ||
788 | } | 782 | } |
789 | 783 | ||
790 | static int | 784 | static int |