diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2011-01-10 16:29:06 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-10 16:47:03 +0100 |
| commit | bed6896d0be1de12eb6237a43a4beaaf7dcfb42c (patch) | |
| tree | 5fd774b329a7754b89387e29b29134980e893ed8 | |
| parent | 60c4ce4a0c2ffbd37d6604f68fa4408ca7226157 (diff) | |
| download | linux-3.10-bed6896d0be1de12eb6237a43a4beaaf7dcfb42c.tar.gz linux-3.10-bed6896d0be1de12eb6237a43a4beaaf7dcfb42c.tar.bz2 linux-3.10-bed6896d0be1de12eb6237a43a4beaaf7dcfb42c.zip | |
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>
| -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 5518371db13..c94c051ad0c 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 = static int snd_ymfpci_drec_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *info) { - static char *texts[3] = {"AC'97", "IEC958", "ZV Port"}; - - info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; - info->count = 1; - info->value.enumerated.items = 3; - if (info->value.enumerated.item > 2) - info->value.enumerated.item = 2; - strcpy(info->value.enumerated.name, texts[info->value.enumerated.item]); - return 0; + static const char *const texts[3] = {"AC'97", "IEC958", "ZV Port"}; + + return snd_ctl_enum_info(info, 1, 3, texts); } static int snd_ymfpci_drec_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *value) |