staging: comedi: mpc624: 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/mpc624.c b/drivers/staging/comedi/drivers/mpc624.c
index 59ad8391cdc8e183fa2aa0ce95166aeb3f787048..f770400a0e818fd7d4543583f2d141b495fe4736 100644 (file)
--- a/drivers/staging/comedi/drivers/mpc624.c
+++ b/drivers/staging/comedi/drivers/mpc624.c
@@ -142,8 +142,18 @@ static const struct comedi_lrange range_mpc624_bipolar10 = {
         }
 };
 
-/* Timeout 200ms */
-#define TIMEOUT 200
+static int mpc624_ai_eoc(struct comedi_device *dev,
+                        struct comedi_subdevice *s,
+                        struct comedi_insn *insn,
+                        unsigned long context)
+{
+       unsigned char status;
+
+       status = inb(dev->iobase + MPC624_ADC);
+       if ((status & MPC624_ADBUSY) == 0)
+               return 0;
+       return -EBUSY;
+}
 
 static int mpc624_ai_rinsn(struct comedi_device *dev,
                           struct comedi_subdevice *s, struct comedi_insn *insn,
@@ -152,7 +162,7 @@ static int mpc624_ai_rinsn(struct comedi_device *dev,
        struct mpc624_private *devpriv = dev->private;
        int n, i;
        unsigned long int data_in, data_out;
-       unsigned char ucPort;
+       int ret;
 
        /*
         *  WARNING:
@@ -170,15 +180,9 @@ static int mpc624_ai_rinsn(struct comedi_device *dev,
                udelay(1);
 
                /*  Wait for the conversion to end */
-               for (i = 0; i < TIMEOUT; i++) {
-                       ucPort = inb(dev->iobase + MPC624_ADC);
-                       if (ucPort & MPC624_ADBUSY)
-                               udelay(1000);
-                       else
-                               break;
-               }
-               if (i == TIMEOUT)
-                       return -ETIMEDOUT;
+               ret = comedi_timeout(dev, s, insn, mpc624_ai_eoc, 0);
+               if (ret)
+                       return ret;
 
                /*  Start reading data */
                data_in = 0;