]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: quatech_daqp_cs: use comedi_buf_write_samples()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 22 Oct 2014 22:37:05 +0000 (15:37 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2014 08:03:14 +0000 (16:03 +0800)
For aesthetics, use comedi_buf_write_samples() to add the 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 in 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/quatech_daqp_cs.c

index 21e99fdf28adde4ea758b594fe6ab8acbd09a473..f6c678eef8d5f3c331d04ab3c73d2ba52ba7bb82 100644 (file)
@@ -221,7 +221,7 @@ static enum irqreturn daqp_interrupt(int irq, void *dev_id)
                        data |= inb(dev->iobase + DAQP_FIFO) << 8;
                        data ^= 0x8000;
 
-                       comedi_buf_put(s, data);
+                       comedi_buf_write_samples(s, &data, 1);
 
                        /* If there's a limit, decrement it
                         * and stop conversion if zero
@@ -245,8 +245,6 @@ static enum irqreturn daqp_interrupt(int irq, void *dev_id)
                        s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
                }
 
-               s->async->events |= COMEDI_CB_BLOCK;
-
                comedi_handle_events(dev, s);
        }
        return IRQ_HANDLED;