From fd26073998783a1ac415c2f7f80a22e9032cdf8e Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Mon, 14 Jan 2013 22:00:54 +0100 Subject: [PATCH] --- yaml --- r: 354045 b: refs/heads/master c: 8ee8f77d9f0f932d9d542a3b2053e092b18ee2b8 h: refs/heads/master i: 354043: 34372dc1bfadfab70b1d1a86fdf817ade6b43cf5 v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/ni_daq_700.c | 25 +------------------ 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/[refs] b/[refs] index 24fd297e2eca..d5fdffe7b05f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7915ce0e6ffef01fc78f157c5158c139f2e7c441 +refs/heads/master: 8ee8f77d9f0f932d9d542a3b2053e092b18ee2b8 diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_700.c b/trunk/drivers/staging/comedi/drivers/ni_daq_700.c index 68d7c6a5db7d..ff0e1993f173 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/trunk/drivers/staging/comedi/drivers/ni_daq_700.c @@ -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 "); MODULE_DESCRIPTION(