leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging/comedi: use comedi_usb_driver_(un)register for init/deinit

Browse Source 
Instead of coding calling comedi_driver_(un)register and
usb_(de)register directly we can use the comedi_usb_driver_(un)register
wrapper.
This removes some boilerplate and is less error prone.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Huewe 2013-01-22 21:07:32 +01:00 committed by Greg Kroah-Hartman
parent e49ee36d24
commit ae59ecfd3f
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/staging/comedi/drivers/dt9812.c
View File

@ -1133,7 +1133,7 @@ static struct comedi_driver dt9812_comedi_driver = {
static int __init usb_dt9812_init(void)
{
int result, i;
int i;
/* Initialize all driver slots */
for (i = 0; i < DT9812_NUM_SLOTS; i++) {
@ -1144,30 +1144,13 @@ static int __init usb_dt9812_init(void)
}
dt9812[12].serial = 0x0;
/* register with the USB subsystem */
result = usb_register(&dt9812_usb_driver);
if (result) {
pr_err("usb_register failed. Error number %d\n", result);
return result;
}
/* register with comedi */
result = comedi_driver_register(&dt9812_comedi_driver);
if (result) {
usb_deregister(&dt9812_usb_driver);
pr_err("comedi_driver_register failed. Error number %d\n",
result);
}
return result;
return comedi_usb_driver_register(&dt9812_comedi_driver,
&dt9812_usb_driver);
}
static void __exit usb_dt9812_exit(void)
{
/* unregister with comedi */
comedi_driver_unregister(&dt9812_comedi_driver);
/* deregister this driver with the USB subsystem */
usb_deregister(&dt9812_usb_driver);
comedi_usb_driver_unregister(&dt9812_comedi_driver, &dt9812_usb_driver);
}
module_init(usb_dt9812_init);