diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 18:20:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 09:12:51 +0200 |
| commit | 3e4bc5b78e5516585941c7888287ed50a5090bf4 (patch) | |
| tree | 103c1caed728154fb2656e64c18191e67ea3a3d3 /sound/pci/sonicvibes.c | |
| parent | 7298ece7a26753b073a9ce5f979a4942d3904d44 (diff) | |
| download | linux-stable-3e4bc5b78e5516585941c7888287ed50a5090bf4.tar.gz linux-stable-3e4bc5b78e5516585941c7888287ed50a5090bf4.tar.bz2 linux-stable-3e4bc5b78e5516585941c7888287ed50a5090bf4.zip | |
ALSA: sonicvibes: 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/pci/sonicvibes.c')
| -rw-r--r-- | sound/pci/sonicvibes.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c index 5b0d317cc9a6..313a7328bf9c 100644 --- a/sound/pci/sonicvibes.c +++ b/sound/pci/sonicvibes.c @@ -918,17 +918,11 @@ static int snd_sonicvibes_pcm(struct sonicvibes *sonic, int device, static int snd_sonicvibes_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { - static char *texts[7] = { + static const char * const texts[7] = { "CD", "PCM", "Aux1", "Line", "Aux0", "Mic", "Mix" }; - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; - uinfo->count = 2; - uinfo->value.enumerated.items = 7; - if (uinfo->value.enumerated.item >= 7) - 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_sonicvibes_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |