Skip to content

Commit

Permalink
staging: comedi: comedi_fc: export increment_scan_progress()
Browse files Browse the repository at this point in the history
Rename this function to cfc_inc_scan_progress() and export it for
use by the comedi drivers.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Mar 17, 2014
1 parent a1b5b0b commit bcc6df4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/comedi/drivers/comedi_fc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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,
Expand All @@ -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;
Expand All @@ -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;
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/comedi/drivers/comedi_fc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *,
Expand Down

0 comments on commit bcc6df4

Please sign in to comment.