Commit 5fe9b247 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: ni_daq_700: 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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 113f7021
...@@ -439,23 +439,11 @@ static struct pcmcia_driver dio700_cs_driver = { ...@@ -439,23 +439,11 @@ static struct pcmcia_driver dio700_cs_driver = {
.name = "ni_daq_700", .name = "ni_daq_700",
}; };
static int __init init_dio700_cs(void)
{
pcmcia_register_driver(&dio700_cs_driver);
return 0;
}
static void __exit exit_dio700_cs(void)
{
pr_debug("ni_daq_700: unloading\n");
pcmcia_unregister_driver(&dio700_cs_driver);
}
static int __init dio700_cs_init(void) static int __init dio700_cs_init(void)
{ {
int ret; int ret;
ret = init_dio700_cs(); ret = pcmcia_register_driver(&dio700_cs_driver);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -465,7 +453,7 @@ module_init(dio700_cs_init); ...@@ -465,7 +453,7 @@ module_init(dio700_cs_init);
static void __exit dio700_cs_exit(void) static void __exit dio700_cs_exit(void)
{ {
exit_dio700_cs(); pcmcia_unregister_driver(&dio700_cs_driver);
comedi_driver_unregister(&driver_dio700); comedi_driver_unregister(&driver_dio700);
} }
module_exit(dio700_cs_exit); module_exit(dio700_cs_exit);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment