malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: snd-usb-caiaq: clean up the control adding code

Browse Source 
snd-usb-caiaq: clean up the control adding code by moving dulpicate code
to a function.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Daniel Mack 2008-11-27 08:21:05 +01:00 committed by Takashi Iwai
parent bc4a68fed4
commit 12666f050b
2 changed files with 46 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
sound/usb/caiaq/caiaq-control.c
View File

@ -247,69 +247,56 @@ static struct caiaq_controller a8dj_controller[] = {
{ "Software lock", 40 } { "Software lock", 40 }
}; };
int __devinit snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *dev) static int __devinit add_controls(struct caiaq_controller *c, int num,
struct snd_usb_caiaqdev *dev)
{ {
int i; int i, ret;
struct snd_kcontrol *kc; struct snd_kcontrol *kc;
switch (dev->chip.usb_id) { for (i = 0; i < num; i++, c++) {
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1): kcontrol_template.name = c->name;
for (i = 0; i < ARRAY_SIZE(ak1_controller); i++) { kcontrol_template.private_value = c->index;
struct caiaq_controller *c = ak1_controller + i; kc = snd_ctl_new1(&kcontrol_template, dev);
kcontrol_template.name = c->name; ret = snd_ctl_add(dev->chip.card, kc);
kcontrol_template.private_value = c->index; if (ret < 0)
kc = snd_ctl_new1(&kcontrol_template, dev); return ret;
snd_ctl_add(dev->chip.card, kc);
}
break;
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2):
for (i = 0; i < ARRAY_SIZE(rk2_controller); i++) {
struct caiaq_controller *c = rk2_controller + i;
kcontrol_template.name = c->name;
kcontrol_template.private_value = c->index;
kc = snd_ctl_new1(&kcontrol_template, dev);
snd_ctl_add(dev->chip.card, kc);
}
break;
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
for (i = 0; i < ARRAY_SIZE(rk3_controller); i++) {
struct caiaq_controller *c = rk3_controller + i;
kcontrol_template.name = c->name;
kcontrol_template.private_value = c->index;
kc = snd_ctl_new1(&kcontrol_template, dev);
snd_ctl_add(dev->chip.card, kc);
}
break;
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_KORECONTROLLER):
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_KORECONTROLLER2):
for (i = 0; i < ARRAY_SIZE(kore_controller); i++) {
struct caiaq_controller *c = kore_controller + i;
kcontrol_template.name = c->name;
kcontrol_template.private_value = c->index;
kc = snd_ctl_new1(&kcontrol_template, dev);
snd_ctl_add(dev->chip.card, kc);
}
break;
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ):
for (i = 0; i < ARRAY_SIZE(a8dj_controller); i++) {
struct caiaq_controller *c = a8dj_controller + i;
kcontrol_template.name = c->name;
kcontrol_template.private_value = c->index;
kc = snd_ctl_new1(&kcontrol_template, dev);
snd_ctl_add(dev->chip.card, kc);
}
break;
} }
return 0; return 0;
} }
int __devinit snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *dev)
{
int ret = 0;
switch (dev->chip.usb_id) {
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
ret = add_controls(ak1_controller,
ARRAY_SIZE(ak1_controller), dev);
break;
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2):
ret = add_controls(rk2_controller,
ARRAY_SIZE(rk2_controller), dev);
break;
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
ret = add_controls(rk3_controller,
ARRAY_SIZE(rk3_controller), dev);
break;
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_KORECONTROLLER):
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_KORECONTROLLER2):
ret = add_controls(kore_controller,
ARRAY_SIZE(kore_controller), dev);
break;
case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ):
ret = add_controls(a8dj_controller,
ARRAY_SIZE(a8dj_controller), dev);
break;
}
return ret;
}

2
sound/usb/caiaq/caiaq-device.c
View File

@ -42,7 +42,7 @@
#endif #endif
MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
MODULE_DESCRIPTION("caiaq USB audio, version 1.3.8"); MODULE_DESCRIPTION("caiaq USB audio, version 1.3.9");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
"{Native Instruments, RigKontrol3}," "{Native Instruments, RigKontrol3},"