AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: ni_mio_common: use comedi_buf_read_samples()

Browse Source 
Use comedi_buf_read_samples() to get the single samples from the async
buffer. The number of samples in the buffer was validated by the callers
so the error checking can be removed. In addition, the core will set the
COMEDI_CB_BLOCK event so it can also be removed.

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-22 14:36:43 -07:00 committed by Greg Kroah-Hartman
parent 8de27e7010
commit e14c6a60b5
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/comedi/drivers/ni_mio_common.c
View File

@ -1132,13 +1132,10 @@ static void ni_ao_fifo_load(struct comedi_device *dev,
unsigned short d;
u32 packed_data;
int range;
int err = 1;
chan = async->cur_chan;
for (i = 0; i < n; i++) {
err &= comedi_buf_get(s, &d);
if (err == 0)
break;
comedi_buf_read_samples(s, &d, 1);
range = CR_RANGE(cmd->chanlist[chan]);
@ -1146,9 +1143,7 @@ static void ni_ao_fifo_load(struct comedi_device *dev,
packed_data = d & 0xffff;
/* 6711 only has 16 bit wide ao fifo */
if (!devpriv->is_6711) {
err &= comedi_buf_get(s, &d);
if (err == 0)
break;
comedi_buf_read_samples(s, &d, 1);
chan++;
i++;
packed_data |= (d << 16) & 0xffff0000;
@ -1161,8 +1156,6 @@ static void ni_ao_fifo_load(struct comedi_device *dev,
chan %= cmd->chanlist_len;
}
async->cur_chan = chan;
if (err == 0)
async->events |= COMEDI_CB_OVERFLOW;
}
/*
@ -1199,8 +1192,6 @@ static int ni_ao_fifo_half_empty(struct comedi_device *dev,
ni_ao_fifo_load(dev, s, n);
s->async->events |= COMEDI_CB_BLOCK;
return 1;
}