summaryrefslogtreecommitdiff
path: root/sound/parisc
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-10-20 18:15:26 +0200
committerTakashi Iwai <tiwai@suse.de>2014-10-21 08:37:36 +0200
commit3c6a73cc6b6ccd9188b3405c744365c0874b9274 (patch)
tree52616176469a5fcf355b77c9311604d1c0cd9e46 /sound/parisc
parent2a2085ab198439c8f08be2f6b9b5cbc9e93877b7 (diff)
downloadlinux-next-3c6a73cc6b6ccd9188b3405c744365c0874b9274.tar.gz
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.c12
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
snd_harmony_captureroute_info(struct snd_kcontrol *kc,
struct snd_ctl_elem_info *uinfo)
{
- static char *texts[2] = { "Line", "Mic" };
- uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
- uinfo->count = 1;
- uinfo->value.enumerated.items = 2;
- if (uinfo->value.enumerated.item > 1)
- uinfo->value.enumerated.item = 1;
- strcpy(uinfo->value.enumerated.name,
- texts[uinfo->value.enumerated.item]);
- return 0;
+ static const char * const texts[2] = { "Line", "Mic" };
+
+ return snd_ctl_enum_info(uinfo, 1, 2, texts);
}
static int