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

staging: comedi: das1800: use comedi_buf_write_samples()

Use comedi_buf_write_samples() to add the samples to the async buffer. That
function will handle single and multi samples writes by determining the number
of bytes to add based on the number of samples and the bytes_per_sample().

Also, remove the unnecessary COMEDI_CB_BLOCK event. comedi_buf_write_samples()
will automatically add that event after adding the samples to the async
buffer.

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/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index 7b0b65e883f6..246a18648223 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -488,8 +488,7 @@ static void das1800_handle_fifo_half_full(struct comedi_device *dev,
 		numPoints = devpriv->count;
 	insw(dev->iobase + DAS1800_FIFO, devpriv->ai_buf0, numPoints);
 	munge_data(dev, devpriv->ai_buf0, numPoints);
-	cfc_write_array_to_buffer(s, devpriv->ai_buf0,
-				  numPoints * sizeof(devpriv->ai_buf0[0]));
+	comedi_buf_write_samples(s, devpriv->ai_buf0, numPoints);
 	if (cmd->stop_src == TRIG_COUNT)
 		devpriv->count -= numPoints;
 }
@@ -512,7 +511,7 @@ static void das1800_handle_fifo_not_empty(struct comedi_device *dev,
 		if (!unipolar)
 			;
 		dpnt = munge_bipolar_sample(dev, dpnt);
-		cfc_write_to_buffer(s, dpnt);
+		comedi_buf_write_samples(s, &dpnt, 1);
 		if (cmd->stop_src == TRIG_COUNT)
 			devpriv->count--;
 	}
@@ -543,7 +542,7 @@ static void das1800_flush_dma_channel(struct comedi_device *dev,
 		num_samples = devpriv->count;
 
 	munge_data(dev, buffer, num_samples);
-	cfc_write_array_to_buffer(s, buffer, num_bytes);
+	comedi_buf_write_samples(s, buffer, num_samples);
 	if (cmd->stop_src == TRIG_COUNT)
 		devpriv->count -= num_samples;
 }
@@ -649,7 +648,6 @@ static void das1800_ai_handler(struct comedi_device *dev)
 		das1800_handle_fifo_not_empty(dev, s);
 	}
 
-	async->events |= COMEDI_CB_BLOCK;
 	/* if the card's fifo has overflowed */
 	if (status & OVF) {
 		/*  clear OVF interrupt bit */