staging: comedi: dt2815: use comedi_timeout()

Use comedi_timeout() to wait for the analog output 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/dt2815.c b/drivers/staging/comedi/drivers/dt2815.c
index ee24717821e187d05f3561d4ab8b3bf5584476fc..1ab1dd76dfd74c0bf5629bf449c8a89b879f0570 100644 (file)
--- a/drivers/staging/comedi/drivers/dt2815.c
+++ b/drivers/staging/comedi/drivers/dt2815.c
@@ -67,15 +67,17 @@ struct dt2815_private {
        unsigned int ao_readback[8];
 };
 
-static int dt2815_wait_for_status(struct comedi_device *dev, int status)
+static int dt2815_ao_status(struct comedi_device *dev,
+                           struct comedi_subdevice *s,
+                           struct comedi_insn *insn,
+                           unsigned long context)
 {
-       int i;
+       unsigned int status;
 
-       for (i = 0; i < 100; i++) {
-               if (inb(dev->iobase + DT2815_STATUS) == status)
-                       break;
-       }
-       return status;
+       status = inb(dev->iobase + DT2815_STATUS);
+       if (status == context)
+               return 0;
+       return -EBUSY;
 }
 
 static int dt2815_ao_insn_read(struct comedi_device *dev,
@@ -98,30 +100,31 @@ static int dt2815_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s,
        struct dt2815_private *devpriv = dev->private;
        int i;
        int chan = CR_CHAN(insn->chanspec);
-       unsigned int status;
        unsigned int lo, hi;
+       int ret;
 
        for (i = 0; i < insn->n; i++) {
                lo = ((data[i] & 0x0f) << 4) | (chan << 1) | 0x01;
                hi = (data[i] & 0xff0) >> 4;
 
-               status = dt2815_wait_for_status(dev, 0x00);
-               if (status != 0) {
+               ret = comedi_timeout(dev, s, insn, dt2815_ao_status, 0x00);
+               if (ret) {
                        dev_dbg(dev->class_dev,
-                               "failed to write low byte on %d reason %x\n",
-                               chan, status);
-                       return -EBUSY;
+                               "failed to write low byte on %d\n",
+                               chan);
+                       return ret;
                }
 
                outb(lo, dev->iobase + DT2815_DATA);
 
-               status = dt2815_wait_for_status(dev, 0x10);
-               if (status != 0x10) {
+               ret = comedi_timeout(dev, s, insn, dt2815_ao_status, 0x10);
+               if (ret) {
                        dev_dbg(dev->class_dev,
-                               "failed to write high byte on %d reason %x\n",
-                               chan, status);
-                       return -EBUSY;
+                               "failed to write high byte on %d\n",
+                               chan);
+                       return ret;
                }
+
                devpriv->ao_readback[chan] = data[i];
        }
        return i;