]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: dt9812: use module_comedi_usb_driver()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 14 May 2013 21:28:01 +0000 (14:28 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 16 May 2013 23:25:59 +0000 (16:25 -0700)
Now that the semaphore used by the comedi_driver is initialized
when the comedi_device private data is allocated, the module_init()
in this driver just clears the 'slot' data before calling
comedi_usb_driver_register(). This static data will already be
cleared when the driver is loaded.

Replace the module_{init,exit}() with the module_comedi_usb_driver()
macro to remove the boilerplate code.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/dt9812.c

index 7c26866c40a2080193d2faa5c558d591830d4414..8a4462ac58171aebbf6ca650d6d78a9f0c5540ab 100644 (file)
@@ -1022,28 +1022,7 @@ static struct usb_driver dt9812_usb_driver = {
        .probe          = dt9812_probe,
        .disconnect     = dt9812_disconnect,
 };
-
-static int __init usb_dt9812_init(void)
-{
-       int i;
-
-       /* Initialize all driver slots */
-       for (i = 0; i < DT9812_NUM_SLOTS; i++) {
-               dt9812[i].usb = NULL;
-               dt9812[i].devpriv = NULL;
-       }
-
-       return comedi_usb_driver_register(&dt9812_comedi_driver,
-                                               &dt9812_usb_driver);
-}
-
-static void __exit usb_dt9812_exit(void)
-{
-       comedi_usb_driver_unregister(&dt9812_comedi_driver, &dt9812_usb_driver);
-}
-
-module_init(usb_dt9812_init);
-module_exit(usb_dt9812_exit);
+module_comedi_usb_driver(dt9812_comedi_driver, dt9812_usb_driver);
 
 MODULE_AUTHOR("Anders Blomdell <anders.blomdell@control.lth.se>");
 MODULE_DESCRIPTION("Comedi DT9812 driver");