mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-02 06:17:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: cb_das16_cs: 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-25 15:20:13 -07:00
committed by Greg Kroah-Hartman
parent 3bbb82c4b4
commit 6f47503dcc
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);