lkml.org 
[lkml]   [2013]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/8] staging/comedi/ni_mio_cs: Convert to module_comedi_pcmcia_driver
    Date
    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 <peterhuewe@gmx.de>
    ---
    drivers/staging/comedi/drivers/ni_mio_cs.c | 20 +-------------------
    1 files changed, 1 insertions(+), 19 deletions(-)

    diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c
    index 76c6a13..b5c5d58 100644
    --- a/drivers/staging/comedi/drivers/ni_mio_cs.c
    +++ b/drivers/staging/comedi/drivers/ni_mio_cs.c
    @@ -408,8 +408,6 @@ static int ni_getboardtype(struct comedi_device *dev,
    return 0;
    }

    -#ifdef MODULE
    -
    static const struct pcmcia_device_id ni_mio_cs_ids[] = {
    PCMCIA_DEVICE_MANF_CARD(0x010b, 0x010d), /* DAQCard-ai-16xe-50 */
    PCMCIA_DEVICE_MANF_CARD(0x010b, 0x010c), /* DAQCard-ai-16e-4 */
    @@ -434,20 +432,4 @@ static struct pcmcia_driver ni_mio_cs_driver = {
    .name = "ni_mio_cs",
    };

    -int init_module(void)
    -{
    - pcmcia_register_driver(&ni_mio_cs_driver);
    - comedi_driver_register(&driver_ni_mio_cs);
    - return 0;
    -}
    -
    -void cleanup_module(void)
    -{
    - pcmcia_unregister_driver(&ni_mio_cs_driver);
    -#if 0
    - while (cur_dev != NULL)
    - cs_detach(cur_dev->handle);
    -#endif
    - comedi_driver_unregister(&driver_ni_mio_cs);
    -}
    -#endif
    +module_comedi_pcmcia_driver(driver_ni_mio_cs, ni_mio_cs_driver);
    --
    1.7.8.6


    \
     
     \ /
      Last update: 2013-01-13 04:01    [W:5.491 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site