staging: comedi: multiq3: 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/multiq3.c b/drivers/staging/comedi/drivers/multiq3.c
index 3ca755eca285dd129741640c7153f7a0413dcfe8..b74b9e9bfd4a0b712bb258184a407fb56d0003e8 100644 (file)
--- a/drivers/staging/comedi/drivers/multiq3.c
+++ b/drivers/staging/comedi/drivers/multiq3.c
@@ -81,34 +81,44 @@ struct multiq3_private {
        unsigned int ao_readback[2];
 };
 
+static int multiq3_ai_status(struct comedi_device *dev,
+                            struct comedi_subdevice *s,
+                            struct comedi_insn *insn,
+                            unsigned long context)
+{
+       unsigned int status;
+
+       status = inw(dev->iobase + MULTIQ3_STATUS);
+       if (status & context)
+               return 0;
+       return -EBUSY;
+}
+
 static int multiq3_ai_insn_read(struct comedi_device *dev,
                                struct comedi_subdevice *s,
                                struct comedi_insn *insn, unsigned int *data)
 {
-       int i, n;
+       int n;
        int chan;
        unsigned int hi, lo;
+       int ret;
 
        chan = CR_CHAN(insn->chanspec);
        outw(MULTIQ3_CONTROL_MUST | MULTIQ3_AD_MUX_EN | (chan << 3),
             dev->iobase + MULTIQ3_CONTROL);
 
-       for (i = 0; i < MULTIQ3_TIMEOUT; i++) {
-               if (inw(dev->iobase + MULTIQ3_STATUS) & MULTIQ3_STATUS_EOC)
-                       break;
-       }
-       if (i == MULTIQ3_TIMEOUT)
-               return -ETIMEDOUT;
+       ret = comedi_timeout(dev, s, insn, multiq3_ai_status,
+                            MULTIQ3_STATUS_EOC);
+       if (ret)
+               return ret;
 
        for (n = 0; n < insn->n; n++) {
                outw(0, dev->iobase + MULTIQ3_AD_CS);
-               for (i = 0; i < MULTIQ3_TIMEOUT; i++) {
-                       if (inw(dev->iobase +
-                               MULTIQ3_STATUS) & MULTIQ3_STATUS_EOC_I)
-                               break;
-               }
-               if (i == MULTIQ3_TIMEOUT)
-                       return -ETIMEDOUT;
+
+               ret = comedi_timeout(dev, s, insn, multiq3_ai_status,
+                                    MULTIQ3_STATUS_EOC_I);
+               if (ret)
+                       return ret;
 
                hi = inb(dev->iobase + MULTIQ3_AD_CS);
                lo = inb(dev->iobase + MULTIQ3_AD_CS);