From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 22 Oct 2014 22:36:58 +0000 (-0700)
Subject: staging: comedi: ni_65xx: use comedi_buf_write_samples()
X-Git-Tag: firefly_0821_release~176^2~2665^2~744
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=562de49c526117fac6c78fb1e92dd7f1f1349af6;p=firefly-linux-kernel-4.4.55.git

staging: comedi: ni_65xx: use comedi_buf_write_samples()

Use comedi_buf_write_samples() to add the sample to the async buffer.

The async events COMEDI_CB_EOS will automatically be set by the core
with the end-of-scan is detected. 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>
---

diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index 973f0058a1e4..bcb326e31562 100644
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -508,9 +508,9 @@ static irqreturn_t ni_65xx_interrupt(int irq, void *d)
 	writeb(NI_65XX_CLR_EDGE_INT | NI_65XX_CLR_OVERFLOW_INT,
 	       dev->mmio + NI_65XX_CLR_REG);
 
-	comedi_buf_put(s, 0);
-	s->async->events |= COMEDI_CB_EOS;
+	comedi_buf_write_samples(s, &s->state, 1);
 	comedi_handle_events(dev, s);
+
 	return IRQ_HANDLED;
 }