From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 20 Oct 2014 16:15:26 +0000 (+0200)
Subject: ALSA: parisc: Use snd_ctl_enum_info()
X-Git-Tag: v4.9.8~5095^2~39^2~105^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c6a73cc6b6ccd9188b3405c744365c0874b9274;p=platform%2Fkernel%2Flinux-rpi3.git

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>
---

diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index 4b20be7..29604a2 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