staging: comedi: das08_cs: consolidate the init and exit functions

The register/unregister of the pcmcia driver is done in separate
functions that are called by the module_{init,exit} routines.
Simplify the code a bit by moving the register/unregister into
the module_{init,exit} routines.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index f62e5f8..14dfc81 100644 (file)
--- a/drivers/staging/comedi/drivers/das08_cs.c
+++ b/drivers/staging/comedi/drivers/das08_cs.c
@@ -235,36 +235,23 @@ struct pcmcia_driver das08_cs_driver = {
        .name = "pcm-das08",
 };
 
-static int __init init_das08_pcmcia_cs(void)
-{
-       pcmcia_register_driver(&das08_cs_driver);
-       return 0;
-}
-
-static void __exit exit_das08_pcmcia_cs(void)
-{
-       pr_debug("das08_pcmcia_cs: unloading\n");
-       pcmcia_unregister_driver(&das08_cs_driver);
-}
-
 static int __init das08_cs_init_module(void)
 {
        int ret;
 
-       ret = init_das08_pcmcia_cs();
+       ret = pcmcia_register_driver(&das08_cs_driver);
        if (ret < 0)
                return ret;
 
        return comedi_driver_register(&driver_das08_cs);
 }
+module_init(das08_cs_init_module);
 
 static void __exit das08_cs_exit_module(void)
 {
-       exit_das08_pcmcia_cs();
+       pcmcia_unregister_driver(&das08_cs_driver);
        comedi_driver_unregister(&driver_das08_cs);
 }
-
-module_init(das08_cs_init_module);
 module_exit(das08_cs_exit_module);
 
 MODULE_AUTHOR("David A. Schleef <ds@schleef.org>, "