From: Peter Huewe Date: Mon, 14 Jan 2013 21:00:51 +0000 (+0100) Subject: staging/comedi/quatech_daqp_cs: Convert to module_comedi_pcmcia_driver X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f3493a973d5e8985e2c61730257ffa43cbabdb09;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git staging/comedi/quatech_daqp_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 Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index ef0cdaa7f02e..55d8cc641967 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -1038,9 +1038,6 @@ static int daqp_cs_resume(struct pcmcia_device *link) } /*====================================================================*/ - -#ifdef MODULE - static const struct pcmcia_device_id daqp_cs_id_table[] = { PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0027), PCMCIA_DEVICE_NULL @@ -1061,17 +1058,4 @@ static struct pcmcia_driver daqp_cs_driver = { .name = "quatech_daqp_cs", }; -int __init init_module(void) -{ - pcmcia_register_driver(&daqp_cs_driver); - comedi_driver_register(&driver_daqp); - return 0; -} - -void __exit cleanup_module(void) -{ - comedi_driver_unregister(&driver_daqp); - pcmcia_unregister_driver(&daqp_cs_driver); -} - -#endif +module_comedi_pcmcia_driver(driver_daqp, daqp_cs_driver);