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

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>

diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c
index 176799849d20ec02c70c6860d106c03aebdff239..fc5b30c70737be9687f94048c603a3bfbf538df4 100644 (file)
--- a/drivers/staging/comedi/drivers/dt9812.c
+++ b/drivers/staging/comedi/drivers/dt9812.c
@@ -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);