From 319ad742bddace99d6576e4b6fba1f074f29ed2a Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 22 Oct 2014 14:36:50 -0700 Subject: [PATCH] staging: comedi: comedi_buf: comedi_buf_memcpy_to() remove 'offset' param This parameter is always passed as '0'. Remove the unnecessary parameter. This allows removing the unnecessary check of the write_ptr overflow. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/comedi_buf.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/comedi/comedi_buf.c b/drivers/staging/comedi/comedi_buf.c index 0e4727dee030..c60fa1aa2048 100644 --- a/drivers/staging/comedi/comedi_buf.c +++ b/drivers/staging/comedi/comedi_buf.c @@ -443,14 +443,10 @@ int comedi_buf_put(struct comedi_subdevice *s, unsigned short x) EXPORT_SYMBOL_GPL(comedi_buf_put); static void comedi_buf_memcpy_to(struct comedi_subdevice *s, - unsigned int offset, const void *data, unsigned int num_bytes) { struct comedi_async *async = s->async; - unsigned int write_ptr = async->buf_write_ptr + offset; - - if (write_ptr >= async->prealloc_bufsz) - write_ptr %= async->prealloc_bufsz; + unsigned int write_ptr = async->buf_write_ptr; while (num_bytes) { unsigned int block_size; @@ -526,7 +522,7 @@ unsigned int comedi_write_array_to_buffer(struct comedi_subdevice *s, return 0; } - comedi_buf_memcpy_to(s, 0, data, num_bytes); + comedi_buf_memcpy_to(s, data, num_bytes); comedi_buf_write_free(s, num_bytes); comedi_inc_scan_progress(s, num_bytes); async->events |= COMEDI_CB_BLOCK; -- 2.11.0