aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/drivers/ni_labpc.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/ni_labpc.c
parent90f703d30dd3e0c16ff80f35e34e511385a05ad5 (diff)
downloadkernel_samsung_smdk4412-7114a28011f9d5f3d981731ad341177c21f9d948.zip
kernel_samsung_smdk4412-7114a28011f9d5f3d981731ad341177c21f9d948.tar.gz
kernel_samsung_smdk4412-7114a28011f9d5f3d981731ad341177c21f9d948.tar.bz2
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/ni_labpc.c')
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index 4966c8e..383ee10 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -2080,7 +2080,18 @@ static void write_caldac(struct comedi_device *dev, unsigned int channel,
#ifdef CONFIG_COMEDI_PCI
COMEDI_PCI_INITCLEANUP(driver_labpc, labpc_pci_table);
#else
-COMEDI_INITCLEANUP(driver_labpc);
+static int __init driver_labpc_init_module(void)
+{
+ return comedi_driver_register(&driver_labpc);
+}
+
+static void __exit driver_labpc_cleanup_module(void)
+{
+ comedi_driver_unregister(&driver_labpc);
+}
+
+module_init(driver_labpc_init_module);
+module_exit(driver_labpc_cleanup_module);
#endif
EXPORT_SYMBOL_GPL(labpc_common_attach);