summaryrefslogtreecommitdiffstats
path: root/sound/mips
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-10-20 18:15:16 +0200
committerTakashi Iwai <tiwai@suse.de>2014-10-21 08:36:44 +0200
commit2a2085ab198439c8f08be2f6b9b5cbc9e93877b7 (patch)
treef873e5586d1fcba3d2381bae97a956a0bfccaf8c /sound/mips
parent0773efa53260a57d6e3bc38469c216635700537e (diff)
downloadlinux-stable-2a2085ab198439c8f08be2f6b9b5cbc9e93877b7.tar.gz
linux-stable-2a2085ab198439c8f08be2f6b9b5cbc9e93877b7.tar.bz2
linux-stable-2a2085ab198439c8f08be2f6b9b5cbc9e93877b7.zip
ALSA: mips: 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/mips')
-rw-r--r--sound/mips/sgio2audio.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c
index 04bb06c03ec8..33b08fcc27a9 100644
--- a/sound/mips/sgio2audio.c
+++ b/sound/mips/sgio2audio.c
@@ -201,17 +201,10 @@ static int sgio2audio_gain_put(struct snd_kcontrol *kcontrol,
static int sgio2audio_source_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{
- static const char *texts[3] = {
+ static const char * const texts[3] = {
"Cam Mic", "Mic", "Line"
};
- uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
- uinfo->count = 1;
- uinfo->value.enumerated.items = 3;
- if (uinfo->value.enumerated.item >= 3)
- uinfo->value.enumerated.item = 1;
- strcpy(uinfo->value.enumerated.name,
- texts[uinfo->value.enumerated.item]);
- return 0;
+ return snd_ctl_enum_info(uinfo, 1, 3, texts);
}
static int sgio2audio_source_get(struct snd_kcontrol *kcontrol,