aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/midi.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2011-01-10 10:30:13 -0500
committerTakashi Iwai <tiwai@suse.de>2011-01-10 10:47:07 -0500
commit2a1803a7291e82823effef0b48b0039324d224c6 (patch)
treeaef83bacecd977821c94466fa38ced959343c6d4 /sound/usb/midi.c
parentbed6896d0be1de12eb6237a43a4beaaf7dcfb42c (diff)
ALSA: usb-audio: use enum control info helper
Simplify info callbacks 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/usb/midi.c')
-rw-r--r--sound/usb/midi.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index 25bce7e5b1af..d7021cb01047 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -1729,13 +1729,7 @@ static int roland_load_info(struct snd_kcontrol *kcontrol,
1729{ 1729{
1730 static const char *const names[] = { "High Load", "Light Load" }; 1730 static const char *const names[] = { "High Load", "Light Load" };
1731 1731
1732 info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; 1732 return snd_ctl_enum_info(info, 1, 2, names);
1733 info->count = 1;
1734 info->value.enumerated.items = 2;
1735 if (info->value.enumerated.item > 1)
1736 info->value.enumerated.item = 1;
1737 strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
1738 return 0;
1739} 1733}
1740 1734
1741static int roland_load_get(struct snd_kcontrol *kcontrol, 1735static int roland_load_get(struct snd_kcontrol *kcontrol,