staging: comedi: amplc_pci230: 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/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index 7356fee..b606bdb 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -799,19 +799,29 @@ static void pci230_cancel_ct(struct comedi_device *dev, unsigned int ct)
        /* Counter ct, 8254 mode 1, initial count not written. */
 }
 
-/*
- *  COMEDI_SUBD_AI instruction;
- */
+static int pci230_ai_eoc(struct comedi_device *dev,
+                        struct comedi_subdevice *s,
+                        struct comedi_insn *insn,
+                        unsigned long context)
+{
+       unsigned int status;
+
+       status = inw(dev->iobase + PCI230_ADCCON);
+       if ((status & PCI230_ADC_FIFO_EMPTY) == 0)
+               return 0;
+       return -EBUSY;
+}
+
 static int pci230_ai_rinsn(struct comedi_device *dev,
                           struct comedi_subdevice *s, struct comedi_insn *insn,
                           unsigned int *data)
 {
        struct pci230_private *devpriv = dev->private;
-       unsigned int n, i;
+       unsigned int n;
        unsigned int chan, range, aref;
        unsigned int gainshift;
-       unsigned int status;
        unsigned short adccon, adcen;
+       int ret;
 
        /* Unpack channel and range. */
        chan = CR_CHAN(insn->chanspec);
@@ -883,17 +893,11 @@ static int pci230_ai_rinsn(struct comedi_device *dev,
                i8254_set_mode(devpriv->iobase1 + PCI230_Z2_CT_BASE, 0, 2,
                               I8254_MODE1);
 
-#define TIMEOUT 100
                /* wait for conversion to end */
-               for (i = 0; i < TIMEOUT; i++) {
-                       status = inw(dev->iobase + PCI230_ADCCON);
-                       if (!(status & PCI230_ADC_FIFO_EMPTY))
-                               break;
-                       udelay(1);
-               }
-               if (i == TIMEOUT) {
+               ret = comedi_timeout(dev, s, insn, pci230_ai_eoc, 0);
+               if (ret) {
                        dev_err(dev->class_dev, "timeout\n");
-                       return -ETIMEDOUT;
+                       return ret;
                }
 
                /* read data */