From bcc6df4d64be495a4ec68e9af86eca5199a3a30e Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 7 Mar 2014 17:31:25 -0700 Subject: [PATCH] staging: comedi: comedi_fc: export increment_scan_progress() Rename this function to cfc_inc_scan_progress() and export it for use by the comedi drivers. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/comedi_fc.c | 8 ++++---- drivers/staging/comedi/drivers/comedi_fc.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/comedi/drivers/comedi_fc.c b/drivers/staging/comedi/drivers/comedi_fc.c index 5d8aa80..9d9b146 100644 --- a/drivers/staging/comedi/drivers/comedi_fc.c +++ b/drivers/staging/comedi/drivers/comedi_fc.c @@ -44,8 +44,7 @@ unsigned int cfc_bytes_per_scan(struct comedi_subdevice *s) } EXPORT_SYMBOL_GPL(cfc_bytes_per_scan); -static void increment_scan_progress(struct comedi_subdevice *s, - unsigned int num_bytes) +void cfc_inc_scan_progress(struct comedi_subdevice *s, unsigned int num_bytes) { struct comedi_async *async = s->async; unsigned int scan_length = cfc_bytes_per_scan(s); @@ -56,6 +55,7 @@ static void increment_scan_progress(struct comedi_subdevice *s, async->events |= COMEDI_CB_EOS; } } +EXPORT_SYMBOL_GPL(cfc_inc_scan_progress); /* Writes an array of data points to comedi's buffer */ unsigned int cfc_write_array_to_buffer(struct comedi_subdevice *s, @@ -76,7 +76,7 @@ unsigned int cfc_write_array_to_buffer(struct comedi_subdevice *s, comedi_buf_memcpy_to(async, 0, data, num_bytes); comedi_buf_write_free(async, num_bytes); - increment_scan_progress(s, num_bytes); + cfc_inc_scan_progress(s, num_bytes); async->events |= COMEDI_CB_BLOCK; return num_bytes; @@ -94,7 +94,7 @@ unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *s, num_bytes = comedi_buf_read_alloc(async, num_bytes); comedi_buf_memcpy_from(async, 0, data, num_bytes); comedi_buf_read_free(async, num_bytes); - increment_scan_progress(s, num_bytes); + cfc_inc_scan_progress(s, num_bytes); async->events |= COMEDI_CB_BLOCK; return num_bytes; diff --git a/drivers/staging/comedi/drivers/comedi_fc.h b/drivers/staging/comedi/drivers/comedi_fc.h index 2d57ad4..541b937 100644 --- a/drivers/staging/comedi/drivers/comedi_fc.h +++ b/drivers/staging/comedi/drivers/comedi_fc.h @@ -24,6 +24,7 @@ #include "../comedidev.h" unsigned int cfc_bytes_per_scan(struct comedi_subdevice *); +void cfc_inc_scan_progress(struct comedi_subdevice *, unsigned int num_bytes); /* Writes an array of data points to comedi's buffer */ unsigned int cfc_write_array_to_buffer(struct comedi_subdevice *, -- 2.7.4