From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 22 Oct 2014 22:36:27 +0000 (-0700)
Subject: staging: comedi: das800: use comedi_buf_write_samples()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ad9eb43c93d83578674e1da78a0bd792c3a22513;p=deliverable%2Flinux.git

staging: comedi: das800: use comedi_buf_write_samples()

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>
---

diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c
index e284d202b7e7..6013099891c0 100644
--- a/drivers/staging/comedi/drivers/das800.c
+++ b/drivers/staging/comedi/drivers/das800.c
@@ -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);