diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 18:14:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 08:31:36 +0200 |
| commit | 69b0c762cfd4c5e86a5b1fc0074889881b859c4a (patch) | |
| tree | 82b385ee9bed39724d06dae198bb2cef02aae998 /sound | |
| parent | 1da0c47779840d038583ea6fa4e3497939d6ea21 (diff) | |
| download | op-kernel-dev-69b0c762cfd4c5e86a5b1fc0074889881b859c4a.zip op-kernel-dev-69b0c762cfd4c5e86a5b1fc0074889881b859c4a.tar.gz | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/isa/es1688/es1688_lib.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c index b3b4f15..de810e4 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) |
