staging/comedi/ni_daq_700: Convert to module_comedi_pcmcia_driver
authorPeter Huewe <peterhuewe@gmx.de>
Mon, 14 Jan 2013 21:00:54 +0000 (22:00 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Jan 2013 00:59:26 +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/ni_daq_700.c

index 68d7c6a5db7dac901fd2f208f923106930c3553f..ff0e1993f173c03381c9a4ef16db95be71f7e8f6 100644 (file)
@@ -334,30 +334,7 @@ static struct pcmcia_driver daq700_cs_driver = {
        .id_table       = daq700_cs_ids,
 };
 
-static int __init daq700_cs_init(void)
-{
-       int ret;
-
-       ret = comedi_driver_register(&daq700_driver);
-       if (ret < 0)
-               return ret;
-
-       ret = pcmcia_register_driver(&daq700_cs_driver);
-       if (ret < 0) {
-               comedi_driver_unregister(&daq700_driver);
-               return ret;
-       }
-
-       return 0;
-}
-module_init(daq700_cs_init);
-
-static void __exit daq700_cs_exit(void)
-{
-       pcmcia_unregister_driver(&daq700_cs_driver);
-       comedi_driver_unregister(&daq700_driver);
-}
-module_exit(daq700_cs_exit);
+module_comedi_pcmcia_driver(daq700_driver, daq700_cs_driver);
 
 MODULE_AUTHOR("Fred Brooks <nsaspook@nsaspook.com>");
 MODULE_DESCRIPTION(