]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: pcl818: use comedi_buf_write_samples()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 22 Oct 2014 22:37:04 +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/pcl818.c

index 9921e1fa7515f444257a50f7a97fd4949e62a375..e6d897bf57145ca9b1b1c7bea722e32497e154c1 100644 (file)
@@ -521,8 +521,6 @@ static bool pcl818_ai_next_chan(struct comedi_device *dev,
        struct pcl818_private *devpriv = dev->private;
        struct comedi_cmd *cmd = &s->async->cmd;
 
-       s->async->events |= COMEDI_CB_BLOCK;
-
        devpriv->act_chanlist_pos++;
        if (devpriv->act_chanlist_pos >= devpriv->act_chanlist_len)
                devpriv->act_chanlist_pos = 0;
@@ -560,7 +558,7 @@ static void pcl818_handle_eoc(struct comedi_device *dev,
        if (pcl818_ai_dropout(dev, s, chan))
                return;
 
-       comedi_buf_put(s, val);
+       comedi_buf_write_samples(s, &val, 1);
 
        pcl818_ai_next_chan(dev, s);
 }
@@ -589,7 +587,7 @@ static void pcl818_handle_dma(struct comedi_device *dev,
                if (pcl818_ai_dropout(dev, s, chan))
                        break;
 
-               comedi_buf_put(s, val);
+               comedi_buf_write_samples(s, &val, 1);
 
                if (!pcl818_ai_next_chan(dev, s))
                        break;
@@ -630,7 +628,7 @@ static void pcl818_handle_fifo(struct comedi_device *dev,
                if (pcl818_ai_dropout(dev, s, chan))
                        break;
 
-               comedi_buf_put(s, val);
+               comedi_buf_write_samples(s, &val, 1);
 
                if (!pcl818_ai_next_chan(dev, s))
                        break;