From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 20 Oct 2014 16:14:07 +0000 (+0200)
Subject: ALSA: es1688: Use snd_ctl_enum_info()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=69b0c762cfd4c5e86a5b1fc0074889881b859c4a;p=linux-beck.git

ALSA: es1688: Use snd_ctl_enum_info()

... and reduce the open codes.  Also correct the array size and add
missing const.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index b3b4f15e45ba..de810e484bdf 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -762,18 +762,12 @@ int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip,
 
 static int snd_es1688_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-	static char *texts[9] = {
+	static const char * const texts[8] = {
 		"Mic", "Mic Master", "CD", "AOUT",
 		"Mic1", "Mix", "Line", "Master"
 	};
 
-	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-	uinfo->count = 1;
-	uinfo->value.enumerated.items = 8;
-	if (uinfo->value.enumerated.item > 7)
-		uinfo->value.enumerated.item = 7;
-	strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-	return 0;
+	return snd_ctl_enum_info(uinfo, 1, 8, texts);
 }
 
 static int snd_es1688_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)