aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/drivers/icp_multi.c
diff options
context:
space:
mode:
authorArun Thomas <arun.thomas@gmail.com>2010-06-06 22:23:30 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-06-17 13:47:00 -0700
commit7114a28011f9d5f3d981731ad341177c21f9d948 (patch)
tree04b7e939249b99d2e814c53564115b39d4c5fb79 /drivers/staging/comedi/drivers/icp_multi.c
parent90f703d30dd3e0c16ff80f35e34e511385a05ad5 (diff)
Staging: comedi: Remove COMEDI_INITCLEANUP macro
Move the init/exit routines to the respective C source files instead of calling COMEDI_INITCLEANUP Signed-off-by: Arun Thomas <arun.thomas@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/icp_multi.c')
-rw-r--r--drivers/staging/comedi/drivers/icp_multi.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index ba42478e6e1..809d17efd5b 100644
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -185,7 +185,18 @@ board_name : &boardtypes[0].name,
offset : sizeof(struct boardtype),
};
-COMEDI_INITCLEANUP(driver_icp_multi);
+static int __init driver_icp_multi_init_module(void)
+{
+ return comedi_driver_register(&driver_icp_multi);
+}
+
+static void __exit driver_icp_multi_cleanup_module(void)
+{
+ comedi_driver_unregister(&driver_icp_multi);
+}
+
+module_init(driver_icp_multi_init_module);
+module_exit(driver_icp_multi_cleanup_module);
struct icp_multi_private {
struct pcilst_struct *card; /* pointer to card */