[PATCH 03/33] staging: comedi: cb_das16_cs: add module_{init, exit} declarations

H Hartley Sweeten hartleys at visionengravers.com
Mon Jun 25 22:18:17 UTC 2012


The init and exit functions for this module were being declared
as global symbols. Add the module_{init,exit} declarations and
make the functions static. Also, rename the functions so they
have namespace associated with the module.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Frank Mori Hess <fmhess at users.sourceforge.net>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/cb_das16_cs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index 76833d0..bca4cbe 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -792,7 +792,7 @@ static void __exit exit_das16cs_pcmcia_cs(void)
 	pcmcia_unregister_driver(&das16cs_driver);
 }
 
-int __init init_module(void)
+static int __init das16cs_init(void)
 {
 	int ret;
 
@@ -802,12 +802,14 @@ int __init init_module(void)
 
 	return comedi_driver_register(&driver_das16cs);
 }
+module_init(das16cs_init);
 
-void __exit cleanup_module(void)
+static void __exit das16cs_exit(void)
 {
 	exit_das16cs_pcmcia_cs();
 	comedi_driver_unregister(&driver_das16cs);
 }
+module_exit(das16cs_exit);
 
 MODULE_AUTHOR("David A. Schleef <ds at schleef.org>");
 MODULE_DESCRIPTION("Comedi driver for Computer Boards PC-CARD DAS16/16");
-- 
1.7.11




More information about the devel mailing list