summaryrefslogtreecommitdiffstats
path: root/sound/pci/es1938.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-10-20 18:17:08 +0200
committerTakashi Iwai <tiwai@suse.de>2014-10-21 08:59:59 +0200
commit6b6b295e8053dd5a005aaa089b5bed4b4a65c632 (patch)
tree6342649212734031b63e9b7496325a6af98ce3af /sound/pci/es1938.c
parent1541c66d3bb78c8a388025b074c75658c790b72f (diff)
downloadop-kernel-dev-6b6b295e8053dd5a005aaa089b5bed4b4a65c632.zip
op-kernel-dev-6b6b295e8053dd5a005aaa089b5bed4b4a65c632.tar.gz
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>
Diffstat (limited to 'sound/pci/es1938.c')
-rw-r--r--sound/pci/es1938.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index 6399624..0fc46eb 100644
--- a/sound/pci/es1938.c
+++ b/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,
struct snd_ctl_elem_info *uinfo)
{
- static char *texts[8] = {
+ 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_es1938_get_mux(struct snd_kcontrol *kcontrol,
OpenPOWER on IntegriCloud