Use the comedi_pcmcia_{enable,disable} helpers to enable/disable
the PCMCIA device.
This driver does not use interrupts and is not an audio device,
remove CONF_ENABLE_IRQ and CONF_AUTO_AUDIO from the link->config_flags.
Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/ni_daq_700.c | 24 +++---------------------
1 file changed, 3 insertions(+), 21 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index e537b8f..0fe2888 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -195,15 +195,6 @@ static void daq700_ai_config(struct comedi_device *dev,
inw(iobase + ADFIFO_R); /* read 16bit junk from FIFO to clear */
}
-static int daq700_pcmcia_config_loop(struct pcmcia_device *p_dev,
- void *priv_data)
-{
- if (p_dev->config_index == 0)
- return -EINVAL;
-
- return pcmcia_request_io(p_dev);
-}
-
static int daq700_auto_attach(struct comedi_device *dev,
unsigned long context)
{
@@ -213,14 +204,8 @@ static int daq700_auto_attach(struct comedi_device *dev,
dev->board_name = dev->driver->driver_name;
- link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_AUDIO |
- CONF_AUTO_SET_IO;
-
- ret = pcmcia_loop_config(link, daq700_pcmcia_config_loop, NULL);
- if (ret)
- return ret;
-
- ret = pcmcia_enable_device(link);
+ link->config_flags |= CONF_AUTO_SET_IO;
+ ret = comedi_pcmcia_enable(dev);
if (ret)
return ret;
dev->iobase = link->resource[0]->start;
@@ -262,10 +247,7 @@ static int daq700_auto_attach(struct comedi_device *dev,
static void daq700_detach(struct comedi_device *dev)
{
- struct pcmcia_device *link = comedi_to_pcmcia_dev(dev);
-
- if (dev->iobase)
- pcmcia_disable_device(link);
+ comedi_pcmcia_disable(dev);
}
static struct comedi_driver daq700_driver = {
--
1.8.1.1.293.gfe73786
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
