staging: comedi: aio_aio12_8: 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/aio_aio12_8.c b/drivers/staging/comedi/drivers/aio_aio12_8.c
index e2a917786f0a80164674e8e52510396cc9cde698..3f994ed3db42d514e4755560960c1190dbfe68aa 100644 (file)
--- a/drivers/staging/comedi/drivers/aio_aio12_8.c
+++ b/drivers/staging/comedi/drivers/aio_aio12_8.c
@@ -101,14 +101,27 @@ struct aio12_8_private {
        unsigned int ao_readback[4];
 };
 
+static int aio_aio12_8_ai_eoc(struct comedi_device *dev,
+                             struct comedi_subdevice *s,
+                             struct comedi_insn *insn,
+                             unsigned long context)
+{
+       unsigned int status;
+
+       status = inb(dev->iobase + AIO12_8_STATUS_REG);
+       if (status & AIO12_8_STATUS_ADC_EOC)
+               return 0;
+       return -EBUSY;
+}
+
 static int aio_aio12_8_ai_read(struct comedi_device *dev,
                               struct comedi_subdevice *s,
                               struct comedi_insn *insn, unsigned int *data)
 {
        unsigned int chan = CR_CHAN(insn->chanspec);
        unsigned int range = CR_RANGE(insn->chanspec);
-       unsigned int val;
        unsigned char control;
+       int ret;
        int n;
 
        /*
@@ -122,20 +135,15 @@ static int aio_aio12_8_ai_read(struct comedi_device *dev,
        inb(dev->iobase + AIO12_8_STATUS_REG);
 
        for (n = 0; n < insn->n; n++) {
-               int timeout = 5;
-
                /*  Setup and start conversion */
                outb(control, dev->iobase + AIO12_8_ADC_REG);
 
                /*  Wait for conversion to complete */
-               do {
-                       val = inb(dev->iobase + AIO12_8_STATUS_REG);
-                       timeout--;
-                       if (timeout == 0) {
-                               dev_err(dev->class_dev, "ADC timeout\n");
-                               return -ETIMEDOUT;
-                       }
-               } while (!(val & AIO12_8_STATUS_ADC_EOC));
+               ret = comedi_timeout(dev, s, insn, aio_aio12_8_ai_eoc, 0);
+               if (ret) {
+                       dev_err(dev->class_dev, "ADC timeout\n");
+                       return ret;
+               }
 
                data[n] = inw(dev->iobase + AIO12_8_ADC_REG) & s->maxdata;
        }