diff options
| author | Peter Huewe <peterhuewe@gmx.de> | 2013-01-14 22:00:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 16:59:25 -0800 |
| commit | 235bee772b0fa4cf059c669bcaa733da08b4894c (patch) | |
| tree | 5106c2b26c23a355eb94003a1c2ac1af3e120dae /drivers/staging/comedi/drivers/ni_mio_cs.c | |
| parent | cb798ccfa0653afe56dd85a48057c1222d19e0b8 (diff) | |
staging/comedi/ni_mio_cs: Convert to module_comedi_pcmcia_driver
This patch removes the boring init/exit functions with the new
module_comedi_pcmcia_driver macro.
Also removed the superflous #ifdef MODULE
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_mio_cs.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_cs.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c index 76c6a13ea9d6..b5c5d58352dc 100644 --- a/drivers/staging/comedi/drivers/ni_mio_cs.c +++ b/drivers/staging/comedi/drivers/ni_mio_cs.c @@ -408,8 +408,6 @@ static int ni_getboardtype(struct comedi_device *dev, return 0; } -#ifdef MODULE - static const struct pcmcia_device_id ni_mio_cs_ids[] = { PCMCIA_DEVICE_MANF_CARD(0x010b, 0x010d), /* DAQCard-ai-16xe-50 */ PCMCIA_DEVICE_MANF_CARD(0x010b, 0x010c), /* DAQCard-ai-16e-4 */ @@ -434,20 +432,4 @@ static struct pcmcia_driver ni_mio_cs_driver = { .name = "ni_mio_cs", }; -int init_module(void) -{ - pcmcia_register_driver(&ni_mio_cs_driver); - comedi_driver_register(&driver_ni_mio_cs); - return 0; -} - -void cleanup_module(void) -{ - pcmcia_unregister_driver(&ni_mio_cs_driver); -#if 0 - while (cur_dev != NULL) - cs_detach(cur_dev->handle); -#endif - comedi_driver_unregister(&driver_ni_mio_cs); -} -#endif +module_comedi_pcmcia_driver(driver_ni_mio_cs, ni_mio_cs_driver); |