From: H Hartley Sweeten Date: Wed, 22 Oct 2014 21:36:41 +0000 (-0700) Subject: staging: comedi: comedi_buf: absorb comedi_read_array_from_buffer() X-Git-Tag: firefly_0821_release~176^2~2665^2~789 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=109bf06e2a88a04607c93d8223e4be0af09ebc8c;p=firefly-linux-kernel-4.4.55.git 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/comedi_buf.c b/drivers/staging/comedi/comedi_buf.c index d1303a831462..9074da2cbe0a 100644 --- 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);