staging: comedi: comedi_buf: absorb comedi_read_array_from_buffer()

This function is only called by comedi_buf_read_samples(). Absorb it.

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/comedi_buf.c b/drivers/staging/comedi/comedi_buf.c
index d1303a831462fdb46b39bc31eda37dea095a14df..9074da2cbe0aae04dfd7fc429fc76d9d96c224a8 100644 (file)
--- a/drivers/staging/comedi/comedi_buf.c
+++ b/drivers/staging/comedi/comedi_buf.c
@@ -549,22 +549,6 @@ unsigned int comedi_write_array_to_buffer(struct comedi_subdevice *s,
 }
 EXPORT_SYMBOL_GPL(comedi_write_array_to_buffer);
 
-static unsigned int comedi_read_array_from_buffer(struct comedi_subdevice *s,
-                                                 void *data,
-                                                 unsigned int num_bytes)
-{
-       if (num_bytes == 0)
-               return 0;
-
-       num_bytes = comedi_buf_read_alloc(s, num_bytes);
-       comedi_buf_memcpy_from(s, 0, data, num_bytes);
-       comedi_buf_read_free(s, num_bytes);
-       comedi_inc_scan_progress(s, num_bytes);
-       s->async->events |= COMEDI_CB_BLOCK;
-
-       return num_bytes;
-}
-
 /**
  * comedi_buf_read_samples - read sample data from comedi buffer
  * @s: comedi_subdevice struct
@@ -587,7 +571,15 @@ unsigned int comedi_buf_read_samples(struct comedi_subdevice *s,
                nsamples = max_samples;
 
        nbytes = nsamples * bytes_per_sample(s);
+       if (nbytes == 0)
+               return 0;
 
-       return comedi_read_array_from_buffer(s, data, nbytes);
+       nbytes = comedi_buf_read_alloc(s, nbytes);
+       comedi_buf_memcpy_from(s, 0, data, nbytes);
+       comedi_buf_read_free(s, nbytes);
+       comedi_inc_scan_progress(s, nbytes);
+       s->async->events |= COMEDI_CB_BLOCK;
+
+       return nbytes;
 }
 EXPORT_SYMBOL_GPL(comedi_buf_read_samples);