staging: comedi: pcl711: use comedi_handle_events()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Thu, 18 Sep 2014 18:35:36 +0000 (11:35 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Oct 2014 02:29:24 +0000 (10:29 +0800)
Use comedi_handle_events() to automatically (*cancel) the async command
for an end-of-acquisition or if an error/overflow occurs.

The pcl711_ai_set_mode() call when the end-of-acquisition is detected
can then be removed. The (*cancel) does the same thing.

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>
drivers/staging/comedi/drivers/pcl711.c

index 47f4887108a7757b8dda67f25f45dd9a5b8e7763..b6e7f342935d767739a206310d40ab0c9e166b0d 100644 (file)
@@ -217,12 +217,10 @@ static irqreturn_t pcl711_interrupt(int irq, void *d)
                s->async->events |= COMEDI_CB_OVERFLOW | COMEDI_CB_ERROR;
        } else {
                s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;
-               if (cmd->stop_src == TRIG_COUNT && !(--devpriv->ntrig)) {
-                       pcl711_ai_set_mode(dev, PCL711_MODE_SOFTTRIG);
+               if (cmd->stop_src == TRIG_COUNT && !(--devpriv->ntrig))
                        s->async->events |= COMEDI_CB_EOA;
-               }
        }
-       comedi_event(dev, s);
+       comedi_handle_events(dev, s);
        return IRQ_HANDLED;
 }