From: H Hartley Sweeten Date: Wed, 22 Oct 2014 22:37:16 +0000 (-0700) Subject: staging: comedi: comedi_buf: don't export comedi_write_array_to_buffer() X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~9070^2~727 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8f90726196b60e94e744b58e004064b84ac2d63d;p=mirror_ubuntu-artful-kernel.git staging: comedi: comedi_buf: don't export comedi_write_array_to_buffer() All the comedi drivers have been converted to use comedi_buf_write_samples(). This function is now only used internally by comedi_buf. Remvoe the export. 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 f4b75d177d7f..c3152d89e608 100644 --- a/drivers/staging/comedi/comedi_buf.c +++ b/drivers/staging/comedi/comedi_buf.c @@ -474,21 +474,9 @@ static void comedi_buf_memcpy_from(struct comedi_subdevice *s, } } -/** - * comedi_write_array_to_buffer - write data to comedi buffer - * @s: comedi_subdevice struct - * @data: destination - * @num_bytes: number of bytes to write - * - * Writes up to num_bytes bytes of data to the comedi buffer associated with - * the subdevice, marks it as written and updates the acquisition scan - * progress. - * - * Returns the amount of data written in bytes. - */ -unsigned int comedi_write_array_to_buffer(struct comedi_subdevice *s, - const void *data, - unsigned int num_bytes) +static unsigned int comedi_write_array_to_buffer(struct comedi_subdevice *s, + const void *data, + unsigned int num_bytes) { struct comedi_async *async = s->async; unsigned int retval; @@ -510,7 +498,6 @@ unsigned int comedi_write_array_to_buffer(struct comedi_subdevice *s, return num_bytes; } -EXPORT_SYMBOL_GPL(comedi_write_array_to_buffer); /** * comedi_buf_write_samples - write sample data to comedi buffer diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index d60b83c26a28..f970a8f95cee 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -441,9 +441,6 @@ unsigned int comedi_buf_read_n_available(struct comedi_subdevice *s); unsigned int comedi_buf_read_alloc(struct comedi_subdevice *s, unsigned int n); unsigned int comedi_buf_read_free(struct comedi_subdevice *s, unsigned int n); -unsigned int comedi_write_array_to_buffer(struct comedi_subdevice *s, - const void *data, - unsigned int num_bytes); unsigned int comedi_buf_write_samples(struct comedi_subdevice *s, const void *data, unsigned int nsamples); unsigned int comedi_buf_read_samples(struct comedi_subdevice *s,