aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2014-09-15 13:46:00 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-19 15:55:31 -0700
commit1c38d6f22a4b0d5128b5ef2c2930f2c96ff37fe8 (patch)
tree8ef96acacceafa0e85c27fba97949822f065dd10
parentstaging: comedi: add comedi_inc_scan_progress() (diff)
staging: comedi: comedi_fc: use comedi_inc_scan_progress()
Since `cfc_inc_scan_progress()` is just an inline function that calls `comedi_inc_scan_progress()`, replace calls to the former to the latter in the "comedi_fc" module. 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/drivers/comedi_fc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/comedi_fc.c b/drivers/staging/comedi/drivers/comedi_fc.c
index 8a4abe8119f8..7401e78a1f41 100644
--- a/drivers/staging/comedi/drivers/comedi_fc.c
+++ b/drivers/staging/comedi/drivers/comedi_fc.c
@@ -41,7 +41,7 @@ unsigned int cfc_write_array_to_buffer(struct comedi_subdevice *s,
comedi_buf_memcpy_to(s, 0, data, num_bytes);
comedi_buf_write_free(s, num_bytes);
- cfc_inc_scan_progress(s, num_bytes);
+ comedi_inc_scan_progress(s, num_bytes);
async->events |= COMEDI_CB_BLOCK;
return num_bytes;
@@ -57,7 +57,7 @@ unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *s,
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);
- cfc_inc_scan_progress(s, num_bytes);
+ comedi_inc_scan_progress(s, num_bytes);
s->async->events |= COMEDI_CB_BLOCK;
return num_bytes;