]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging/comedi/das08_cs: Convert to module_comedi_pcmcia_driver
authorPeter Huewe <peterhuewe@gmx.de>
Mon, 14 Jan 2013 21:00:53 +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/das08_cs.c

index 024262375e3c2abed705da3c753c5f73e3525ef2..73a2418933f7e6027badd3731161ea2c9af93b54 100644 (file)
@@ -181,31 +181,7 @@ static struct pcmcia_driver das08_cs_driver = {
        .id_table       = das08_cs_id_table,
 };
 
-static int __init das08_cs_init_module(void)
-{
-       int ret;
-
-       ret = comedi_driver_register(&driver_das08_cs);
-       if (ret < 0)
-               return ret;
-
-       ret = pcmcia_register_driver(&das08_cs_driver);
-       if (ret < 0) {
-               comedi_driver_unregister(&driver_das08_cs);
-               return ret;
-       }
-
-       return 0;
-
-}
-module_init(das08_cs_init_module);
-
-static void __exit das08_cs_exit_module(void)
-{
-       pcmcia_unregister_driver(&das08_cs_driver);
-       comedi_driver_unregister(&driver_das08_cs);
-}
-module_exit(das08_cs_exit_module);
+module_comedi_pcmcia_driver(driver_das08_cs, das08_cs_driver);
 
 MODULE_AUTHOR("David A. Schleef <ds@schleef.org>, "
              "Frank Mori Hess <fmhess@users.sourceforge.net>");