staging: comedi: pcmmio: use comedi_async 'scans_done' to detect EOA

Remove the private data member 'count' and use the comedi_async 'scans_done'
member to detect the end-of-acquisition.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c
index df47967c2650113923a9f2bafd0f3b7c1df31ab4..985fabd879aaebddf4ca284e438c597e560281aa 100644 (file)
--- a/drivers/staging/comedi/drivers/pcmmio.c
+++ b/drivers/staging/comedi/drivers/pcmmio.c
@@ -190,7 +190,6 @@ struct pcmmio_private {
        spinlock_t pagelock;    /* protects the page registers */
        spinlock_t spinlock;    /* protects the member variables */
        unsigned int enabled_mask;
-       unsigned int stop_count;
        unsigned int active:1;
 };
 
@@ -358,12 +357,9 @@ static void pcmmio_handle_dio_intr(struct comedi_device *dev,
 
        comedi_buf_write_samples(s, &val, 1);
 
-       /* Check for end of acquisition. */
-       if (cmd->stop_src == TRIG_COUNT && devpriv->stop_count > 0) {
-               devpriv->stop_count--;
-               if (devpriv->stop_count == 0)
-                       s->async->events |= COMEDI_CB_EOA;
-       }
+       if (cmd->stop_src == TRIG_COUNT &&
+           s->async->scans_done >= cmd->stop_arg)
+               s->async->events |= COMEDI_CB_EOA;
 
 done:
        spin_unlock_irqrestore(&devpriv->spinlock, flags);
@@ -468,8 +464,6 @@ static int pcmmio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
        spin_lock_irqsave(&devpriv->spinlock, flags);
        devpriv->active = 1;
 
-       devpriv->stop_count = cmd->stop_arg;
-
        /* Set up start of acquisition. */
        if (cmd->start_src == TRIG_INT)
                s->async->inttrig = pcmmio_inttrig_start_intr;