diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 18:13:39 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 08:30:40 +0200 |
| commit | 1da0c47779840d038583ea6fa4e3497939d6ea21 (patch) | |
| tree | 5249df32358760674390e65dc0672c05d72ba403 | |
| parent | 609e478b40aceaa07d14f1bada02a3874bac2c45 (diff) | |
| download | linux-1da0c47779840d038583ea6fa4e3497939d6ea21.tar.gz linux-1da0c47779840d038583ea6fa4e3497939d6ea21.tar.bz2 linux-1da0c47779840d038583ea6fa4e3497939d6ea21.zip | |
ALSA: ad1816a: 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>
| -rw-r--r-- | sound/isa/ad1816a/ad1816a_lib.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c index f0fd98e695e3..01a07986f4a3 100644 --- a/sound/isa/ad1816a/ad1816a_lib.c +++ b/sound/isa/ad1816a/ad1816a_lib.c @@ -731,18 +731,12 @@ int snd_ad1816a_timer(struct snd_ad1816a *chip, int device, static int snd_ad1816a_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { - static char *texts[8] = { + static const char * const texts[8] = { "Line", "Mix", "CD", "Synth", "Video", "Mic", "Phone", }; - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; - uinfo->count = 2; - uinfo->value.enumerated.items = 7; - if (uinfo->value.enumerated.item > 6) - uinfo->value.enumerated.item = 6; - strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); - return 0; + return snd_ctl_enum_info(uinfo, 2, 7, texts); } static int snd_ad1816a_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |