iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2012-06-22 16:14:30 -07:00 committed by Greg Kroah-Hartman
parent 113f702149
commit 5fe9b247cc
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/comedi/drivers/ni_daq_700.c
View File

@ -439,23 +439,11 @@ static struct pcmcia_driver dio700_cs_driver = {
.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)
{
int ret;
ret = init_dio700_cs();
ret = pcmcia_register_driver(&dio700_cs_driver);
if (ret < 0)
return ret;
@ -465,7 +453,7 @@ module_init(dio700_cs_init);
static void __exit dio700_cs_exit(void)
{
exit_dio700_cs();
pcmcia_unregister_driver(&dio700_cs_driver);
comedi_driver_unregister(&driver_dio700);
}
module_exit(dio700_cs_exit);