Skip to content

Commit

Permalink
staging/comedi/ni_daq_700: 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.

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 7915ce0 commit 8ee8f77
Showing 1 changed file with 1 addition and 24 deletions.
25 changes: 1 addition & 24 deletions drivers/staging/comedi/drivers/ni_daq_700.c
Original file line number Diff line number Diff line change
Expand Up @@ -334,30 +334,7 @@ static struct pcmcia_driver daq700_cs_driver = {
.id_table = daq700_cs_ids,
};

static int __init daq700_cs_init(void)
{
int ret;

ret = comedi_driver_register(&daq700_driver);
if (ret < 0)
return ret;

ret = pcmcia_register_driver(&daq700_cs_driver);
if (ret < 0) {
comedi_driver_unregister(&daq700_driver);
return ret;
}

return 0;
}
module_init(daq700_cs_init);

static void __exit daq700_cs_exit(void)
{
pcmcia_unregister_driver(&daq700_cs_driver);
comedi_driver_unregister(&daq700_driver);
}
module_exit(daq700_cs_exit);
module_comedi_pcmcia_driver(daq700_driver, daq700_cs_driver);

MODULE_AUTHOR("Fred Brooks <nsaspook@nsaspook.com>");
MODULE_DESCRIPTION(
Expand Down

0 comments on commit 8ee8f77

Please sign in to comment.