staging: comedi: pcmuio: use comedi_handle_events()

Use comedi_handle_events() to automatically (*cancel) the async command
for an end-of-acquisition or if an error/overflow occurs.

Also, comedi_handle_events() does nothing if no events are set so the
local variable 'oldevents' can be removed.

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/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index d4fe2ec25ecfca29475d29d1a2ade7acd319a5cc..28e659889e4fc82510d78b7fc8ce165cea2a4379 100644 (file)
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -317,7 +317,6 @@ static void pcmuio_handle_intr_subdev(struct comedi_device *dev,
        int asic = pcmuio_subdevice_to_asic(s);
        struct pcmuio_asic *chip = &devpriv->asics[asic];
        struct comedi_cmd *cmd = &s->async->cmd;
-       unsigned oldevents = s->async->events;
        unsigned int val = 0;
        unsigned long flags;
        unsigned int i;
@@ -339,31 +338,22 @@ static void pcmuio_handle_intr_subdev(struct comedi_device *dev,
 
        /* Write the scan to the buffer. */
        if (comedi_buf_put(s, val) &&
-           comedi_buf_put(s, val >> 16)) {
+           comedi_buf_put(s, val >> 16))
                s->async->events |= (COMEDI_CB_BLOCK | COMEDI_CB_EOS);
-       } else {
-               /* Overflow! Stop acquisition!! */
-               /* TODO: STOP_ACQUISITION_CALL_HERE!! */
-               pcmuio_stop_intr(dev, s);
-       }
 
        /* Check for end of acquisition. */
        if (cmd->stop_src == TRIG_COUNT) {
                if (chip->stop_count > 0) {
                        chip->stop_count--;
-                       if (chip->stop_count == 0) {
+                       if (chip->stop_count == 0)
                                s->async->events |= COMEDI_CB_EOA;
-                               /* TODO: STOP_ACQUISITION_CALL_HERE!! */
-                               pcmuio_stop_intr(dev, s);
-                       }
                }
        }
 
 done:
        spin_unlock_irqrestore(&chip->spinlock, flags);
 
-       if (oldevents != s->async->events)
-               comedi_event(dev, s);
+       comedi_handle_events(dev, s);
 }
 
 static int pcmuio_handle_asic_interrupt(struct comedi_device *dev, int asic)