Skip to content

Commit

Permalink
staging: comedi: das08_cs: consolidate the init and exit functions
Browse files Browse the repository at this point in the history
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 6, 2012
1 parent 3a36ad1 commit 4687770
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions drivers/staging/comedi/drivers/das08_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -235,36 +235,23 @@ struct pcmcia_driver das08_cs_driver = {
.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)
{
int ret;

ret = init_das08_pcmcia_cs();
ret = pcmcia_register_driver(&das08_cs_driver);
if (ret < 0)
return ret;

return comedi_driver_register(&driver_das08_cs);
}
module_init(das08_cs_init_module);

static void __exit das08_cs_exit_module(void)
{
exit_das08_pcmcia_cs();
pcmcia_unregister_driver(&das08_cs_driver);
comedi_driver_unregister(&driver_das08_cs);
}

module_init(das08_cs_init_module);
module_exit(das08_cs_exit_module);

MODULE_AUTHOR("David A. Schleef <ds@schleef.org>, "
Expand Down

0 comments on commit 4687770

Please sign in to comment.