diff options
author | Peter Huewe <peterhuewe@gmx.de> | 2013-01-14 22:00:55 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 16:59:26 -0800 |
commit | 952bf230a5d8bae3ffc27c9b91b2475eda909727 (patch) | |
tree | 7e75d3736e0b57dec18a7bbc0739fd94998a81a4 | |
parent | 8ee8f77d9f0f932d9d542a3b2053e092b18ee2b8 (diff) |
staging/comedi/ni_labpc_cs: Convert to module_comedi_pcmcia_driver
This patch removes the boring init/exit functions with the new
module_comedi_pcmcia_driver macro.
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc_cs.c | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c index bfe19fa7d66f..b26496df3e96 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c @@ -282,33 +282,4 @@ static struct pcmcia_driver labpc_cs_driver = { .name = "daqcard-1200", }; -static int __init init_labpc_cs(void) -{ - pcmcia_register_driver(&labpc_cs_driver); - return 0; -} - -static void __exit exit_labpc_cs(void) -{ - pcmcia_unregister_driver(&labpc_cs_driver); -} - -static int __init labpc_init_module(void) -{ - int ret; - - ret = init_labpc_cs(); - if (ret < 0) - return ret; - - return comedi_driver_register(&driver_labpc_cs); -} - -static void __exit labpc_exit_module(void) -{ - exit_labpc_cs(); - comedi_driver_unregister(&driver_labpc_cs); -} - -module_init(labpc_init_module); -module_exit(labpc_exit_module); +module_comedi_pcmcia_driver(driver_labpc_cs, labpc_cs_driver); |