* [PATCH 04/31] staging: comedi: ni_daq_700: consolidate the init and exit functions
@ 2012-06-22 23:14 H Hartley Sweeten
0 siblings, 0 replies; only message in thread
From: H Hartley Sweeten @ 2012-06-22 23:14 UTC (permalink / raw)
To: Linux Kernel; +Cc: devel, abbotti, fmhess, gregkh
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>
Cc: Greg Kroah-hartman <gregkh@linuxfoundation.org>
---
drivers/staging/comedi/drivers/ni_daq_700.c | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index 052a051..b06792b 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -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);
--
1.7.11
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-06-22 23:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-22 23:14 [PATCH 04/31] staging: comedi: ni_daq_700: consolidate the init and exit functions H Hartley Sweeten
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.