This patch removes the boring init/exit functions with the new
module_comedi_pcmcia_driver macro.

Signed-off-by: Peter Huewe <peterhu...@gmx.de>
---
 drivers/staging/comedi/drivers/ni_daq_700.c |   25 +------------------------
 1 files changed, 1 insertions(+), 24 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c 
b/drivers/staging/comedi/drivers/ni_daq_700.c
index 68d7c6a..ff0e199 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -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 <nsasp...@nsaspook.com>");
 MODULE_DESCRIPTION(
-- 
1.7.8.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to