From 025b3a0f13fd8659d01970d3abd85e5d6364b4af Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Mon, 14 Jan 2013 22:00:49 +0100 Subject: [PATCH] --- yaml --- r: 354040 b: refs/heads/master c: cb798ccfa0653afe56dd85a48057c1222d19e0b8 h: refs/heads/master v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/ni_daq_dio24.c | 29 +------------------ 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/[refs] b/[refs] index 63afdebde610..7b846d3e582c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d607ffac4cbd22599f2b006465c722104cc1cd1b +refs/heads/master: cb798ccfa0653afe56dd85a48057c1222d19e0b8 diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c index 7b333353c5d9..dd22691b1df1 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c @@ -318,31 +318,4 @@ static struct pcmcia_driver dio24_cs_driver = { .name = "ni_daq_dio24", }; -static int __init init_dio24_cs(void) -{ - printk("ni_daq_dio24: HOLA SOY YO!\n"); - pcmcia_register_driver(&dio24_cs_driver); - return 0; -} - -static void __exit exit_dio24_cs(void) -{ - pcmcia_unregister_driver(&dio24_cs_driver); -} - -int __init init_module(void) -{ - int ret; - - ret = init_dio24_cs(); - if (ret < 0) - return ret; - - return comedi_driver_register(&driver_dio24); -} - -void __exit cleanup_module(void) -{ - exit_dio24_cs(); - comedi_driver_unregister(&driver_dio24); -} +module_comedi_pcmcia_driver(driver_dio24, dio24_cs_driver);