diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 18:21:15 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 09:14:28 +0200 |
| commit | 5fe0b0e3ea1c8cb704677ef7e85345bb683f9182 (patch) | |
| tree | f88c98b133cb6c594a1698b80f442e8175f20ba0 /sound | |
| parent | 9502272163ace71d77d809937216fd669c02364b (diff) | |
| download | linux-stable-5fe0b0e3ea1c8cb704677ef7e85345bb683f9182.tar.gz linux-stable-5fe0b0e3ea1c8cb704677ef7e85345bb683f9182.tar.bz2 linux-stable-5fe0b0e3ea1c8cb704677ef7e85345bb683f9182.zip | |
ALSA: sparc: 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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/sparc/cs4231.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 4e91bcaa3664..06606f9bbf78 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c @@ -1285,19 +1285,11 @@ static int snd_cs4231_timer(struct snd_card *card) static int snd_cs4231_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { - static char *texts[4] = { + static const char * const texts[4] = { "Line", "CD", "Mic", "Mix" }; - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; - uinfo->count = 2; - uinfo->value.enumerated.items = 4; - if (uinfo->value.enumerated.item > 3) - uinfo->value.enumerated.item = 3; - strcpy(uinfo->value.enumerated.name, - texts[uinfo->value.enumerated.item]); - - return 0; + return snd_ctl_enum_info(uinfo, 2, 4, texts); } static int snd_cs4231_get_mux(struct snd_kcontrol *kcontrol, |