2012-06-22 23:13:34

by Hartley Sweeten

[permalink] [raw]
Subject: [PATCH 03/31] staging: comedi: ni_daq_700: add the module_{init,exit} declarations

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 <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Frank Mori Hess <[email protected]>
Cc: Greg Kroah-hartman <[email protected]>
---
drivers/staging/comedi/drivers/ni_daq_700.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index e75bdd0..052a051 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -451,7 +451,7 @@ static void __exit exit_dio700_cs(void)
pcmcia_unregister_driver(&dio700_cs_driver);
}

-int __init init_module(void)
+static int __init dio700_cs_init(void)
{
int ret;

@@ -461,12 +461,14 @@ int __init init_module(void)

return comedi_driver_register(&driver_dio700);
}
+module_init(dio700_cs_init);

-void __exit cleanup_module(void)
+static void __exit dio700_cs_exit(void)
{
exit_dio700_cs();
comedi_driver_unregister(&driver_dio700);
}
+module_exit(dio700_cs_exit);

MODULE_AUTHOR("Fred Brooks <[email protected]>");
MODULE_DESCRIPTION(
--
1.7.11