staging: comedi: pcl816: use comedi_buf_write_samples()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 22 Oct 2014 22:37:03 +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/pcl816.c

index 65cbafb85698525b75ab58e893696352da990599..a471c3df12b490f63d81227ee5dfa85c2ac2486a 100644 (file)
@@ -289,8 +289,6 @@ static bool pcl816_ai_next_chan(struct comedi_device *dev,
        struct pcl816_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;
@@ -313,10 +311,12 @@ static void transfer_from_dma_buf(struct comedi_device *dev,
                                  unsigned short *ptr,
                                  unsigned int bufptr, unsigned int len)
 {
+       unsigned short val;
        int i;
 
        for (i = 0; i < len; i++) {
-               comedi_buf_put(s, ptr[bufptr++]);
+               val = ptr[bufptr++];
+               comedi_buf_write_samples(s, &val, 1);
 
                if (!pcl816_ai_next_chan(dev, s))
                        return;