]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: das800: use comedi_buf_write_samples()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 22 Oct 2014 22:36:27 +0000 (15:36 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2014 08:03:10 +0000 (16:03 +0800)
Use comedi_buf_write_samples() instead of cfc_write_to_buffer() to add the
single sample to the async buffer.

The core will add the COMEDI_CB_BLOCK event when data is written to the
async buffer. Remove the unnecessary event from the driver.

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/das800.c

index e284d202b7e7ac1a53754305210de72dfc1c7e2b..6013099891c0a9004e6bab9cc2db04571b13a47f 100644 (file)
@@ -511,12 +511,11 @@ static irqreturn_t das800_interrupt(int irq, void *d)
 
                /* if there are more data points to collect */
                if (cmd->stop_src == TRIG_NONE || devpriv->count > 0) {
-                       /* write data point to buffer */
-                       cfc_write_to_buffer(s, val & s->maxdata);
+                       val &= s->maxdata;
+                       comedi_buf_write_samples(s, &val, 1);
                        devpriv->count--;
                }
        }
-       async->events |= COMEDI_CB_BLOCK;
 
        if (fifo_overflow) {
                spin_unlock_irqrestore(&dev->spinlock, irq_flags);