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

The register/unregister of the pcmcia driver is done is 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>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index bca4cbeb06f21d5d8c7e051de892f3f68b5e6c7b..624e00598668277f405ba73ce609f1fb5350149f 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -780,23 +780,11 @@ struct pcmcia_driver das16cs_driver = {
        .name = "cb_das16_cs",
 };
 
-static int __init init_das16cs_pcmcia_cs(void)
-{
-       pcmcia_register_driver(&das16cs_driver);
-       return 0;
-}
-
-static void __exit exit_das16cs_pcmcia_cs(void)
-{
-       pr_debug("das16cs_pcmcia_cs: unloading\n");
-       pcmcia_unregister_driver(&das16cs_driver);
-}
-
 static int __init das16cs_init(void)
 {
        int ret;
 
-       ret = init_das16cs_pcmcia_cs();
+       ret = pcmcia_register_driver(&das16cs_driver);
        if (ret < 0)
                return ret;
 
@@ -806,7 +794,7 @@ module_init(das16cs_init);
 
 static void __exit das16cs_exit(void)
 {
-       exit_das16cs_pcmcia_cs();
+       pcmcia_unregister_driver(&das16cs_driver);
        comedi_driver_unregister(&driver_das16cs);
 }
 module_exit(das16cs_exit);