staging: comedi: s526: 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/s526.c b/drivers/staging/comedi/drivers/s526.c
index 0a93afa..85d2b7a 100644 (file)
--- a/drivers/staging/comedi/drivers/s526.c
+++ b/drivers/staging/comedi/drivers/s526.c
@@ -420,15 +420,28 @@ static int s526_ai_insn_config(struct comedi_device *dev,
        return result;
 }
 
+static int s526_ai_eoc(struct comedi_device *dev,
+                      struct comedi_subdevice *s,
+                      struct comedi_insn *insn,
+                      unsigned long context)
+{
+       unsigned int status;
+
+       status = inw(dev->iobase + REG_ISR);
+       if (status & ISR_ADC_DONE)
+               return 0;
+       return -EBUSY;
+}
+
 static int s526_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                         struct comedi_insn *insn, unsigned int *data)
 {
        struct s526_private *devpriv = dev->private;
        unsigned int chan = CR_CHAN(insn->chanspec);
-       int n, i;
+       int n;
        unsigned short value;
        unsigned int d;
-       unsigned int status;
+       int ret;
 
        /* Set configured delay, enable channel for this channel only,
         * select "ADC read" channel, set "ADC start" bit. */
@@ -440,17 +453,12 @@ static int s526_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
                /* trigger conversion */
                outw(value, dev->iobase + REG_ADC);
 
-#define TIMEOUT 100
                /* wait for conversion to end */
-               for (i = 0; i < TIMEOUT; i++) {
-                       status = inw(dev->iobase + REG_ISR);
-                       if (status & ISR_ADC_DONE) {
-                               outw(ISR_ADC_DONE, dev->iobase + REG_ISR);
-                               break;
-                       }
-               }
-               if (i == TIMEOUT)
-                       return -ETIMEDOUT;
+               ret = comedi_timeout(dev, s, insn, s526_ai_eoc, 0);
+               if (ret)
+                       return ret;
+
+               outw(ISR_ADC_DONE, dev->iobase + REG_ISR);
 
                /* read data */
                d = inw(dev->iobase + REG_ADD);