github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-03 03:53:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

staging: comedi: adv_pci1710: use sample manipulation helpers

Browse Source 
Use the recently added sample manipulation helpers to remove the hardcoded
assumption of the sample size.

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>
This commit is contained in:
H Hartley Sweeten 2014-10-31 12:04:32 -07:00 committed by Greg Kroah-Hartman
parent bd508fffda
commit b7f9eb0549
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/comedi/drivers/adv_pci1710.c
View File

@ -823,7 +823,8 @@ static void pci1710_handle_fifo(struct comedi_device *dev,
const struct boardtype *this_board = dev->board_ptr;
struct pci1710_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd;
int m, samplesinbuf;
unsigned int nsamples;
unsigned int m;
m = inw(dev->iobase + PCI171x_STATUS);
if (!(m & Status_FH)) {
@ -840,16 +841,16 @@ static void pci1710_handle_fifo(struct comedi_device *dev,
return;
}
samplesinbuf = this_board->fifo_half_size;
if (samplesinbuf * sizeof(short) >= s->async->prealloc_bufsz) {
m = s->async->prealloc_bufsz / sizeof(short);
nsamples = this_board->fifo_half_size;
if (comedi_samples_to_bytes(s, nsamples) >= s->async->prealloc_bufsz) {
m = comedi_bytes_to_samples(s, s->async->prealloc_bufsz);
if (move_block_from_fifo(dev, s, m, 0))
return;
samplesinbuf -= m;
nsamples -= m;
}
if (samplesinbuf) {
if (move_block_from_fifo(dev, s, samplesinbuf, 1))
if (nsamples) {
if (move_block_from_fifo(dev, s, nsamples, 1))
return;
}