From 34372dc1bfadfab70b1d1a86fdf817ade6b43cf5 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Mon, 14 Jan 2013 22:00:52 +0100 Subject: [PATCH] --- yaml --- r: 354043 b: refs/heads/master c: 66bf1ed6f6d8364a67c1c15c2fd2885b0f268405 h: refs/heads/master i: 354041: 1c889f31c99fe3171dc4312cc9b6dd9d8c84419c 354039: e68a69ced3e0c5d66f785794a29ddde2c905e2d0 v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/cb_das16_cs.c | 25 +------------------ 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/[refs] b/[refs] index 6c628c7883c0..6e5dabe1ae3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3493a973d5e8985e2c61730257ffa43cbabdb09 +refs/heads/master: 66bf1ed6f6d8364a67c1c15c2fd2885b0f268405 diff --git a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c index 93731de1f2b1..e253fc03cefa 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -548,30 +548,7 @@ static struct pcmcia_driver das16cs_driver = { .id_table = das16cs_id_table, }; -static int __init das16cs_init(void) -{ - int ret; - - ret = comedi_driver_register(&driver_das16cs); - if (ret < 0) - return ret; - - ret = pcmcia_register_driver(&das16cs_driver); - if (ret < 0) { - comedi_driver_unregister(&driver_das16cs); - return ret; - } - - return 0; -} -module_init(das16cs_init); - -static void __exit das16cs_exit(void) -{ - pcmcia_unregister_driver(&das16cs_driver); - comedi_driver_unregister(&driver_das16cs); -} -module_exit(das16cs_exit); +module_comedi_pcmcia_driver(driver_das16cs, das16cs_driver); MODULE_AUTHOR("David A. Schleef "); MODULE_DESCRIPTION("Comedi driver for Computer Boards PC-CARD DAS16/16");