staging: comedi: pcl812: use comedi_buf_write_samples()

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 nnecessary 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/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c
index 72ae48f4d2565031510dc13c630d9493c8a4afea..eef646253bf9e5cafa6f230d187c7847992c5b1a 100644 (file)
--- a/drivers/staging/comedi/drivers/pcl812.c
+++ b/drivers/staging/comedi/drivers/pcl812.c
@@ -844,8 +844,6 @@ static bool pcl812_ai_next_chan(struct comedi_device *dev,
        struct pcl812_private *devpriv = dev->private;
        struct comedi_cmd *cmd = &s->async->cmd;
 
-       s->async->events |= COMEDI_CB_BLOCK;
-
        s->async->cur_chan++;
        if (s->async->cur_chan >= cmd->chanlist_len) {
                s->async->cur_chan = 0;
@@ -868,6 +866,7 @@ static void pcl812_handle_eoc(struct comedi_device *dev,
 {
        struct comedi_cmd *cmd = &s->async->cmd;
        unsigned int next_chan;
+       unsigned short val;
 
        if (pcl812_ai_eoc(dev, s, NULL, 0)) {
                dev_dbg(dev->class_dev, "A/D cmd IRQ without DRDY!\n");
@@ -875,7 +874,8 @@ static void pcl812_handle_eoc(struct comedi_device *dev,
                return;
        }
 
-       comedi_buf_put(s, pcl812_ai_get_sample(dev, s));
+       val = pcl812_ai_get_sample(dev, s);
+       comedi_buf_write_samples(s, &val, 1);
 
        /* Set up next channel. Added by abbotti 2010-01-20, but untested. */
        next_chan = s->async->cur_chan + 1;
@@ -893,9 +893,11 @@ static void transfer_from_dma_buf(struct comedi_device *dev,
                                  unsigned int bufptr, unsigned int len)
 {
        unsigned int i;
+       unsigned short val;
 
        for (i = len; i; i--) {
-               comedi_buf_put(s, ptr[bufptr++]);
+               val = ptr[bufptr++];
+               comedi_buf_write_samples(s, &val, 1);
 
                if (!pcl812_ai_next_chan(dev, s))
                        break;