staging/comedi/cb_das16_cs: Convert to module_comedi_pcmcia_driver
authorPeter Huewe <peterhuewe@gmx.de>
Mon, 14 Jan 2013 21:00:52 +0000 (22:00 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Jan 2013 00:59:25 +0000 (16:59 -0800)
This patch removes the boring init/exit functions with the new
module_comedi_pcmcia_driver macro.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/cb_das16_cs.c

index 93731de1f2b1b1317682c5a04bf6ccba93485efe..e253fc03ceface18ce93658a4c4e7a53f3404a3c 100644 (file)
@@ -548,30 +548,7 @@ static struct pcmcia_driver das16cs_driver = {
        .id_table       = das16cs_id_table,
 };
 
-static int __init das16cs_init(void)
-{
-       int ret;
-
-       ret = comedi_driver_register(&driver_das16cs);
-       if (ret < 0)
-               return ret;
-
-       ret = pcmcia_register_driver(&das16cs_driver);
-       if (ret < 0) {
-               comedi_driver_unregister(&driver_das16cs);
-               return ret;
-       }
-
-       return 0;
-}
-module_init(das16cs_init);
-
-static void __exit das16cs_exit(void)
-{
-       pcmcia_unregister_driver(&das16cs_driver);
-       comedi_driver_unregister(&driver_das16cs);
-}
-module_exit(das16cs_exit);
+module_comedi_pcmcia_driver(driver_das16cs, das16cs_driver);
 
 MODULE_AUTHOR("David A. Schleef <ds@schleef.org>");
 MODULE_DESCRIPTION("Comedi driver for Computer Boards PC-CARD DAS16/16");