Skip to content

Commit

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

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 8ee8f77 commit 952bf23
Showing 1 changed file with 1 addition and 30 deletions.
31 changes: 1 addition & 30 deletions drivers/staging/comedi/drivers/ni_labpc_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

0 comments on commit 952bf23

Please sign in to comment.