staging: comedi: pcl711: use comedi_timeout()

Use comedi_timeout() to wait for the analog input end-of-conversion.

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/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c
index 6595788..7c03a5d 100644 (file)
--- a/drivers/staging/comedi/drivers/pcl711.c
+++ b/drivers/staging/comedi/drivers/pcl711.c
@@ -253,18 +253,17 @@ static void pcl711_set_changain(struct comedi_device *dev,
        outb(mux | PCL711_MUX_CHAN(chan), dev->iobase + PCL711_MUX_REG);
 }
 
-static int pcl711_ai_wait_for_eoc(struct comedi_device *dev,
-                                 unsigned int timeout)
+static int pcl711_ai_eoc(struct comedi_device *dev,
+                        struct comedi_subdevice *s,
+                        struct comedi_insn *insn,
+                        unsigned long context)
 {
-       unsigned int msb;
+       unsigned int status;
 
-       while (timeout--) {
-               msb = inb(dev->iobase + PCL711_AI_MSB_REG);
-               if ((msb & PCL711_AI_MSB_DRDY) == 0)
-                       return 0;
-               udelay(1);
-       }
-       return -ETIME;
+       status = inb(dev->iobase + PCL711_AI_MSB_REG);
+       if ((status & PCL711_AI_MSB_DRDY) == 0)
+               return 0;
+       return -EBUSY;
 }
 
 static int pcl711_ai_insn_read(struct comedi_device *dev,
@@ -282,7 +281,7 @@ static int pcl711_ai_insn_read(struct comedi_device *dev,
        for (i = 0; i < insn->n; i++) {
                outb(PCL711_SOFTTRIG, dev->iobase + PCL711_SOFTTRIG_REG);
 
-               ret = pcl711_ai_wait_for_eoc(dev, 100);
+               ret = comedi_timeout(dev, s, insn, pcl711_ai_eoc, 0);
                if (ret)
                        return ret;