Commit 12d6dda6 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: mite: use cfc_inc_scan_progress()

Use the comedi_fc helper function instead of duplicating the code.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bcc6df4d
...@@ -527,9 +527,9 @@ EXPORT_SYMBOL_GPL(mite_dma_disarm); ...@@ -527,9 +527,9 @@ EXPORT_SYMBOL_GPL(mite_dma_disarm);
int mite_sync_input_dma(struct mite_channel *mite_chan, int mite_sync_input_dma(struct mite_channel *mite_chan,
struct comedi_async *async) struct comedi_async *async)
{ {
struct comedi_subdevice *s = async->subdevice;
int count; int count;
unsigned int nbytes, old_alloc_count; unsigned int nbytes, old_alloc_count;
const unsigned bytes_per_scan = cfc_bytes_per_scan(async->subdevice);
old_alloc_count = async->buf_write_alloc_count; old_alloc_count = async->buf_write_alloc_count;
/* write alloc as much as we can */ /* write alloc as much as we can */
...@@ -538,7 +538,7 @@ int mite_sync_input_dma(struct mite_channel *mite_chan, ...@@ -538,7 +538,7 @@ int mite_sync_input_dma(struct mite_channel *mite_chan,
nbytes = mite_bytes_written_to_memory_lb(mite_chan); nbytes = mite_bytes_written_to_memory_lb(mite_chan);
if ((int)(mite_bytes_written_to_memory_ub(mite_chan) - if ((int)(mite_bytes_written_to_memory_ub(mite_chan) -
old_alloc_count) > 0) { old_alloc_count) > 0) {
dev_warn(async->subdevice->device->class_dev, dev_warn(s->device->class_dev,
"mite: DMA overwrite of free area\n"); "mite: DMA overwrite of free area\n");
async->events |= COMEDI_CB_OVERFLOW; async->events |= COMEDI_CB_OVERFLOW;
return -1; return -1;
...@@ -551,12 +551,7 @@ int mite_sync_input_dma(struct mite_channel *mite_chan, ...@@ -551,12 +551,7 @@ int mite_sync_input_dma(struct mite_channel *mite_chan,
return 0; return 0;
comedi_buf_write_free(async, count); comedi_buf_write_free(async, count);
cfc_inc_scan_progress(s, count);
async->scan_progress += count;
if (async->scan_progress >= bytes_per_scan) {
async->scan_progress %= bytes_per_scan;
async->events |= COMEDI_CB_EOS;
}
async->events |= COMEDI_CB_BLOCK; async->events |= COMEDI_CB_BLOCK;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment