Browse Source

ALSA: es1938: 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>
Takashi Iwai 10 năm trước cách đây
mục cha
commit
6b6b295e80
1 tập tin đã thay đổi với 2 bổ sung8 xóa
  1. 2 8
      sound/pci/es1938.c

+ 2 - 8
sound/pci/es1938.c

@@ -1045,18 +1045,12 @@ static int snd_es1938_new_pcm(struct es1938 *chip, int device)
 static int snd_es1938_info_mux(struct snd_kcontrol *kcontrol,
 static int snd_es1938_info_mux(struct snd_kcontrol *kcontrol,
 			       struct snd_ctl_elem_info *uinfo)
 			       struct snd_ctl_elem_info *uinfo)
 {
 {
-	static char *texts[8] = {
+	static const char * const texts[8] = {
 		"Mic", "Mic Master", "CD", "AOUT",
 		"Mic", "Mic Master", "CD", "AOUT",
 		"Mic1", "Mix", "Line", "Master"
 		"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_es1938_get_mux(struct snd_kcontrol *kcontrol,
 static int snd_es1938_get_mux(struct snd_kcontrol *kcontrol,