diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2011-01-10 10:29:06 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-01-10 10:47:03 -0500 |
commit | bed6896d0be1de12eb6237a43a4beaaf7dcfb42c (patch) | |
tree | 5fd774b329a7754b89387e29b29134980e893ed8 /sound/pci/ymfpci | |
parent | 60c4ce4a0c2ffbd37d6604f68fa4408ca7226157 (diff) |
ALSA: ymfpci: use enum control info helper
Simplify the info callback by using the snd_ctl_enum_info() helper function.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ymfpci')
-rw-r--r-- | sound/pci/ymfpci/ymfpci_main.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index 5518371db13f..c94c051ad0c8 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c | |||
@@ -1389,15 +1389,9 @@ static struct snd_kcontrol_new snd_ymfpci_spdif_stream __devinitdata = | |||
1389 | 1389 | ||
1390 | static int snd_ymfpci_drec_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *info) | 1390 | static int snd_ymfpci_drec_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *info) |
1391 | { | 1391 | { |
1392 | static char *texts[3] = {"AC'97", "IEC958", "ZV Port"}; | 1392 | static const char *const texts[3] = {"AC'97", "IEC958", "ZV Port"}; |
1393 | 1393 | ||
1394 | info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | 1394 | return snd_ctl_enum_info(info, 1, 3, texts); |
1395 | info->count = 1; | ||
1396 | info->value.enumerated.items = 3; | ||
1397 | if (info->value.enumerated.item > 2) | ||
1398 | info->value.enumerated.item = 2; | ||
1399 | strcpy(info->value.enumerated.name, texts[info->value.enumerated.item]); | ||
1400 | return 0; | ||
1401 | } | 1395 | } |
1402 | 1396 | ||
1403 | static int snd_ymfpci_drec_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *value) | 1397 | static int snd_ymfpci_drec_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *value) |