iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: amplc_pci224: use cfc_bytes_per_scan()

Browse Source 
The cmd->chanlist_len will always be >= 1 in this function. Remove the
unnecessary checks.

Use the comedi_fc helper function to get the 'bytes_per_scan'.

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-05-27 10:31:06 -07:00 committed by Greg Kroah-Hartman
parent 3ba01fe618
commit 35a5103099
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/comedi/drivers/amplc_pci224.c
View File

@ -545,18 +545,12 @@ static void pci224_ao_handle_fifo(struct comedi_device *dev,
{
struct pci224_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd;
unsigned int bytes_per_scan = cfc_bytes_per_scan(s);
unsigned int num_scans;
unsigned int room;
unsigned short dacstat;
unsigned int i, n;
unsigned int bytes_per_scan;
if (cmd->chanlist_len) {
bytes_per_scan = cmd->chanlist_len * sizeof(short);
} else {
/* Shouldn't get here! */
bytes_per_scan = sizeof(short);
}
/* Determine number of scans available in buffer. */
num_scans = comedi_buf_read_n_available(s) / bytes_per_scan;
if (cmd->stop_src == TRIG_COUNT) {
@ -597,8 +591,7 @@ static void pci224_ao_handle_fifo(struct comedi_device *dev,
}
}
/* Determine how many new scans can be put in the FIFO. */
if (cmd->chanlist_len)
room /= cmd->chanlist_len;
room /= cmd->chanlist_len;
/* Determine how many scans to process. */
if (num_scans > room)