diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2014-09-15 13:46:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-19 15:55:31 -0700 |
| commit | af2c6a8a2429dd40555a9efd4f286eca2ab9add0 (patch) | |
| tree | cd7d641ab5524ad75edd15a829e350f85b3c7fdb | |
| parent | ea29c1d563a4d57db1c2955c22468a0947f110b0 (diff) | |
staging: comedi: comedi_fc.h: use comedi_write_array_to_buffer()
Since `cfc_write_array_to_buffer()` is just an inline function that
calls `comedi_write_array_to_buffer()`, replace calls to the former to
the latter in the "comedi_fc.h" header. This is part of the migration
of functionality from the "comedi_fc" module to the core "comedi"
module.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/comedi_buf.c | 13 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/comedi_fc.h | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/drivers/staging/comedi/comedi_buf.c b/drivers/staging/comedi/comedi_buf.c index 5aa86842fcce..52a75d2238dc 100644 --- a/drivers/staging/comedi/comedi_buf.c +++ b/drivers/staging/comedi/comedi_buf.c @@ -510,7 +510,18 @@ void comedi_buf_memcpy_from(struct comedi_subdevice *s, unsigned int offset, } EXPORT_SYMBOL_GPL(comedi_buf_memcpy_from); -/* Writes an array of data points to comedi's buffer */ +/** + * 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) diff --git a/drivers/staging/comedi/drivers/comedi_fc.h b/drivers/staging/comedi/drivers/comedi_fc.h index 51b3157bd348..75bbc3130a90 100644 --- a/drivers/staging/comedi/drivers/comedi_fc.h +++ b/drivers/staging/comedi/drivers/comedi_fc.h @@ -44,13 +44,13 @@ static inline unsigned int cfc_write_array_to_buffer(struct comedi_subdevice *s, static inline unsigned int cfc_write_to_buffer(struct comedi_subdevice *s, unsigned short data) { - return cfc_write_array_to_buffer(s, &data, sizeof(data)); + return comedi_write_array_to_buffer(s, &data, sizeof(data)); }; static inline unsigned int cfc_write_long_to_buffer(struct comedi_subdevice *s, unsigned int data) { - return cfc_write_array_to_buffer(s, &data, sizeof(data)); + return comedi_write_array_to_buffer(s, &data, sizeof(data)); }; unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *, |