From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 4 Feb 2013 23:41:49 +0000 (-0700)
Subject: staging: comedi: quatech_daqp_cs: use comedi_pcmcia_{enable, disable}
X-Git-Tag: next-20130218~26^2~123
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=87fe1452c6b0154e43fa7c544977279a504ad0e4;p=karo-tx-linux.git

staging: comedi: quatech_daqp_cs: use comedi_pcmcia_{enable, disable}

Use the comedi_pcmcia_{enable,disable} helpers to enable/disable
the PCMCIA device.

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>
---

diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index 64092363fd31..869a4afc440e 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -718,14 +718,6 @@ static int daqp_do_insn_write(struct comedi_device *dev,
 	return 1;
 }
 
-static int daqp_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 daqp_auto_attach(struct comedi_device *dev,
 			    unsigned long context)
 {
@@ -742,20 +734,16 @@ static int daqp_auto_attach(struct comedi_device *dev,
 		return -ENOMEM;
 
 	link->config_flags |= CONF_AUTO_SET_IO | CONF_ENABLE_IRQ;
-	ret = pcmcia_loop_config(link, daqp_pcmcia_config_loop, NULL);
+	ret = comedi_pcmcia_enable(dev);
 	if (ret)
 		return ret;
+	dev->iobase = link->resource[0]->start;
 
 	link->priv = local;
 	ret = pcmcia_request_irq(link, daqp_interrupt);
 	if (ret)
 		return ret;
 
-	ret = pcmcia_enable_device(link);
-	if (ret)
-		return ret;
-	dev->iobase = link->resource[0]->start;
-
 	ret = comedi_alloc_subdevices(dev, 4);
 	if (ret)
 		return ret;
@@ -804,9 +792,7 @@ static int daqp_auto_attach(struct comedi_device *dev,
 
 static void daqp_detach(struct comedi_device *dev)
 {
-	struct pcmcia_device *link = comedi_to_pcmcia_dev(dev);
-
-	pcmcia_disable_device(link);
+	comedi_pcmcia_disable(dev);
 }
 
 static struct comedi_driver driver_daqp = {