]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: adl_pci9111: use comedi_buf_write_samples()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 22 Oct 2014 22:36:38 +0000 (15:36 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2014 08:03:11 +0000 (16:03 +0800)
Use comedi_buf_write_samples() to add the samples to the async buffer.
The number of bytes to add is determined automatically based on the
number of samples and the bytes_per_sample().

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/adl_pci9111.c

index 076866e121a0dee29bdf1ef68ddd17e476d19926..18f5f7fc1bc84c1188f92d6b6033de9da278317d 100644 (file)
@@ -477,9 +477,8 @@ static void pci9111_handle_fifo_half_full(struct comedi_device *dev,
             devpriv->ai_bounce_buffer, samples);
 
        if (devpriv->scan_delay < 1) {
-               total = cfc_write_array_to_buffer(s,
-                                                 devpriv->ai_bounce_buffer,
-                                                 samples * sizeof(short));
+               total = comedi_buf_write_samples(s, devpriv->ai_bounce_buffer,
+                                                samples);
        } else {
                unsigned int pos = 0;
                unsigned int to_read;
@@ -492,9 +491,9 @@ static void pci9111_handle_fifo_half_full(struct comedi_device *dev,
                                if (to_read > samples - pos)
                                        to_read = samples - pos;
 
-                               total += cfc_write_array_to_buffer(s,
+                               total += comedi_buf_write_samples(s,
                                                devpriv->ai_bounce_buffer + pos,
-                                               to_read * sizeof(short));
+                                               to_read);
                        } else {
                                to_read = devpriv->chunk_num_samples -
                                          devpriv->chunk_counter;