staging: comedi: amplc_pci224: use cfc_bytes_per_scan()

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>

diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index 44904fd87b27bbb15cc7e5807bc7fdc5d887b5ea..339c47c1eb97d5a9f561f136305474c7497dd270 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -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)