From 1db3bb5dad747ec469ca2a9103ff6a2ea8ab8aad Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Mon, 14 Jan 2013 22:00:53 +0100 Subject: [PATCH] --- yaml --- r: 354044 b: refs/heads/master c: 7915ce0e6ffef01fc78f157c5158c139f2e7c441 h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/das08_cs.c | 26 +------------------ 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/[refs] b/[refs] index 6e5dabe1ae3e..24fd297e2eca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66bf1ed6f6d8364a67c1c15c2fd2885b0f268405 +refs/heads/master: 7915ce0e6ffef01fc78f157c5158c139f2e7c441 diff --git a/trunk/drivers/staging/comedi/drivers/das08_cs.c b/trunk/drivers/staging/comedi/drivers/das08_cs.c index 024262375e3c..73a2418933f7 100644 --- a/trunk/drivers/staging/comedi/drivers/das08_cs.c +++ b/trunk/drivers/staging/comedi/drivers/das08_cs.c @@ -181,31 +181,7 @@ static struct pcmcia_driver das08_cs_driver = { .id_table = das08_cs_id_table, }; -static int __init das08_cs_init_module(void) -{ - int ret; - - ret = comedi_driver_register(&driver_das08_cs); - if (ret < 0) - return ret; - - ret = pcmcia_register_driver(&das08_cs_driver); - if (ret < 0) { - comedi_driver_unregister(&driver_das08_cs); - return ret; - } - - return 0; - -} -module_init(das08_cs_init_module); - -static void __exit das08_cs_exit_module(void) -{ - pcmcia_unregister_driver(&das08_cs_driver); - comedi_driver_unregister(&driver_das08_cs); -} -module_exit(das08_cs_exit_module); +module_comedi_pcmcia_driver(driver_das08_cs, das08_cs_driver); MODULE_AUTHOR("David A. Schleef , " "Frank Mori Hess ");