Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f47503d authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: cb_das16_cs: 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 3bbb82c4

drivers/staging/comedi/drivers/cb_das16_cs.c

+2 −14
Original line number Diff line number Diff line
@@ -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);