From 1a4ff11ad3de7ce3837737f8124056989bcc9ebc Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 4 Feb 2013 14:21:56 -0700
Subject: [PATCH] --- yaml --- r: 354365 b: refs/heads/master c:
 7dc99109f53535f888bc13ea2aad3632acdda475 h: refs/heads/master i:   354363:
 eef216794c51c0aaab17655f78feb33f149f06d4 v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/ni_daq_700.c       | 24 +++----------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 0e612a93d3d2..d40bfcce4fcb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95f932cea3b59003fc019acbf32fadb53a529778
+refs/heads/master: 7dc99109f53535f888bc13ea2aad3632acdda475
diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_700.c b/trunk/drivers/staging/comedi/drivers/ni_daq_700.c
index e537b8f05903..0fe2888dd207 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/trunk/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 = {