diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 20:18:50 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-21 11:02:50 +0400 |
| commit | 597da2e4dfa04c8ee66b09fce931ab6825bc3e75 (patch) | |
| tree | d130e83bdb4dff46addb77f01f1ac6831f202203 /sound/pci/ice1712/prodigy192.c | |
| parent | c4fa251f6f3ed00d59d0d8ee63bf346e6dd6b664 (diff) | |
| download | linux-597da2e4dfa04c8ee66b09fce931ab6825bc3e75.tar.xz | |
ALSA: ice1724: Use snd_ctl_enum_info()
... and reduce the open codes. Also add missing const to text arrays.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ice1712/prodigy192.c')
| -rw-r--r-- | sound/pci/ice1712/prodigy192.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/sound/pci/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c index f3b491aa3e22..1eb151aaa965 100644 --- a/sound/pci/ice1712/prodigy192.c +++ b/sound/pci/ice1712/prodigy192.c @@ -284,15 +284,7 @@ static int stac9460_mic_sw_info(struct snd_kcontrol *kcontrol, { static const char * const texts[2] = { "Line In", "Mic" }; - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; - uinfo->count = 1; - uinfo->value.enumerated.items = 2; - - if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items) - uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1; - strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); - - return 0; + return snd_ctl_enum_info(uinfo, 1, 2, texts); } @@ -563,13 +555,7 @@ static int ak4114_input_sw_info(struct snd_kcontrol *kcontrol, { static const char * const texts[2] = { "Toslink", "Coax" }; - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; - uinfo->count = 1; - uinfo->value.enumerated.items = 2; - if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items) - uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1; - strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); - return 0; + return snd_ctl_enum_info(uinfo, 1, 2, texts); } |