shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-03 17:51:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: comedi_buf: absorb comedi_read_array_from_buffer()

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten
2014-10-22 14:36:41 -07:00
committed by Greg Kroah-Hartman
parent 2b3e13b860
commit 109bf06e2a
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/staging/comedi/comedi_buf.c
View File

@@ -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);