提交 46877702 编写于 作者: H H Hartley Sweeten 提交者: Greg Kroah-Hartman

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: NH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 3a36ad17
...@@ -235,36 +235,23 @@ struct pcmcia_driver das08_cs_driver = { ...@@ -235,36 +235,23 @@ struct pcmcia_driver das08_cs_driver = {
.name = "pcm-das08", .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) static int __init das08_cs_init_module(void)
{ {
int ret; int ret;
ret = init_das08_pcmcia_cs(); ret = pcmcia_register_driver(&das08_cs_driver);
if (ret < 0) if (ret < 0)
return ret; return ret;
return comedi_driver_register(&driver_das08_cs); return comedi_driver_register(&driver_das08_cs);
} }
module_init(das08_cs_init_module);
static void __exit das08_cs_exit_module(void) static void __exit das08_cs_exit_module(void)
{ {
exit_das08_pcmcia_cs(); pcmcia_unregister_driver(&das08_cs_driver);
comedi_driver_unregister(&driver_das08_cs); comedi_driver_unregister(&driver_das08_cs);
} }
module_init(das08_cs_init_module);
module_exit(das08_cs_exit_module); module_exit(das08_cs_exit_module);
MODULE_AUTHOR("David A. Schleef <ds@schleef.org>, " MODULE_AUTHOR("David A. Schleef <ds@schleef.org>, "
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册