Skip to content

Commit

Permalink
staging/comedi/ni_mio_cs: Convert to module_comedi_pcmcia_driver
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Huewe authored and Greg Kroah-Hartman committed Jan 18, 2013
1 parent cb798cc commit 235bee7
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions drivers/staging/comedi/drivers/ni_mio_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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);

0 comments on commit 235bee7

Please sign in to comment.