diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-02-05 18:16:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-05 18:16:19 -0800 |
| commit | 5cd8e852629fc7f1bdaacbdd32fe4139b9944f8b (patch) | |
| tree | 791fe9bbd6abb5728996d6de3844a0734ef1eb4d | |
| parent | a3ac95195b020a0a8fa2a9b0649145324ba64c83 (diff) | |
staging: comedi: ni_mio_cs: use comedi_pcmcia_{enable, disable}
Use the comedi_pcmcia_{enable,disable} helpers to enable/disable
the PCMCIA device.
This driver uses a local (*conf_check) to check the pcmcia_device
configuration.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_cs.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c index 4151abad8195..4da4d09a40ab 100644 --- a/drivers/staging/comedi/drivers/ni_mio_cs.c +++ b/drivers/staging/comedi/drivers/ni_mio_cs.c @@ -251,20 +251,15 @@ static int mio_cs_auto_attach(struct comedi_device *dev, dev->board_ptr = board; dev->board_name = board->name; - link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO; - - ret = pcmcia_loop_config(link, mio_pcmcia_config_loop, NULL); + link->config_flags |= CONF_AUTO_SET_IO | CONF_ENABLE_IRQ; + ret = comedi_pcmcia_enable(dev, mio_pcmcia_config_loop); if (ret) return ret; + dev->iobase = link->resource[0]->start; if (!link->irq) return -EINVAL; - ret = pcmcia_enable_device(link); - if (ret) - return ret; - dev->iobase = link->resource[0]->start; - ret = request_irq(link->irq, ni_E_interrupt, NI_E_IRQ_FLAGS, dev->board_name, dev); if (ret < 0) @@ -286,13 +281,10 @@ static int mio_cs_auto_attach(struct comedi_device *dev, static void mio_cs_detach(struct comedi_device *dev) { - struct pcmcia_device *link = comedi_to_pcmcia_dev(dev); - mio_common_detach(dev); if (dev->irq) free_irq(dev->irq, dev); - if (dev->iobase) - pcmcia_disable_device(link); + comedi_pcmcia_disable(dev); } static struct comedi_driver driver_ni_mio_cs = { |