diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2011-01-10 10:27:26 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-01-10 10:46:56 -0500 |
commit | dd1224aa3ebfdef6cddcfb68ddcd0e682eaf9f84 (patch) | |
tree | cff1d8fd24f0cafbeb87a77cc2285ef1dcc124cc /sound/pci/bt87x.c | |
parent | 9600732b6caba595f34acf2abd930098ec9a0b2b (diff) |
ALSA: bt87x: 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/bt87x.c')
-rw-r--r-- | sound/pci/bt87x.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index 37e1b5df5ab8..2958a05b5293 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c | |||
@@ -637,15 +637,9 @@ static struct snd_kcontrol_new snd_bt87x_capture_boost = { | |||
637 | static int snd_bt87x_capture_source_info(struct snd_kcontrol *kcontrol, | 637 | static int snd_bt87x_capture_source_info(struct snd_kcontrol *kcontrol, |
638 | struct snd_ctl_elem_info *info) | 638 | struct snd_ctl_elem_info *info) |
639 | { | 639 | { |
640 | static char *texts[3] = {"TV Tuner", "FM", "Mic/Line"}; | 640 | static const char *const texts[3] = {"TV Tuner", "FM", "Mic/Line"}; |
641 | 641 | ||
642 | info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | 642 | return snd_ctl_enum_info(info, 1, 3, texts); |
643 | info->count = 1; | ||
644 | info->value.enumerated.items = 3; | ||
645 | if (info->value.enumerated.item > 2) | ||
646 | info->value.enumerated.item = 2; | ||
647 | strcpy(info->value.enumerated.name, texts[info->value.enumerated.item]); | ||
648 | return 0; | ||
649 | } | 643 | } |
650 | 644 | ||
651 | static int snd_bt87x_capture_source_get(struct snd_kcontrol *kcontrol, | 645 | static int snd_bt87x_capture_source_get(struct snd_kcontrol *kcontrol, |