]> Pileus Git - ~andy/linux/commitdiff
staging/comedi/ni_labpc_cs: Convert to module_comedi_pcmcia_driver
authorPeter Huewe <peterhuewe@gmx.de>
Mon, 14 Jan 2013 21:00:55 +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_labpc_cs.c

index bfe19fa7d66f6206919a8c5856682f4e71b237e7..b26496df3e967eef7f1af8931587b1e47cdabf09 100644 (file)
@@ -282,33 +282,4 @@ static struct pcmcia_driver labpc_cs_driver = {
        .name = "daqcard-1200",
 };
 
-static int __init init_labpc_cs(void)
-{
-       pcmcia_register_driver(&labpc_cs_driver);
-       return 0;
-}
-
-static void __exit exit_labpc_cs(void)
-{
-       pcmcia_unregister_driver(&labpc_cs_driver);
-}
-
-static int __init labpc_init_module(void)
-{
-       int ret;
-
-       ret = init_labpc_cs();
-       if (ret < 0)
-               return ret;
-
-       return comedi_driver_register(&driver_labpc_cs);
-}
-
-static void __exit labpc_exit_module(void)
-{
-       exit_labpc_cs();
-       comedi_driver_unregister(&driver_labpc_cs);
-}
-
-module_init(labpc_init_module);
-module_exit(labpc_exit_module);
+module_comedi_pcmcia_driver(driver_labpc_cs, labpc_cs_driver);