Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af2c6a8a authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

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: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ea29c1d5

drivers/staging/comedi/comedi_buf.c

+12 −1
Original line number Diff line number Diff line
@@ -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)

drivers/staging/comedi/drivers/comedi_fc.h

+2 −2
Original line number Diff line number Diff line
@@ -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 *,