staging: comedi: adl_pc19111: remove 'chanlist_len' from private data
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 5 May 2014 16:48:19 +0000 (09:48 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 May 2014 12:21:30 +0000 (21:21 +0900)
This member of the private data is a copy of the cmd->chanlist_len. Use
that instead.

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>
drivers/staging/comedi/drivers/adl_pci9111.c

index 7596b4e8a96b86f2eb1797a1ab2f504c2b211133..c84930ca804061b46841a9cb35eda42e2401c79b 100644 (file)
@@ -139,7 +139,6 @@ struct pci9111_private_data {
        int stop_counter;
 
        unsigned int scan_delay;
-       unsigned int chanlist_len;
        unsigned int chunk_counter;
        unsigned int chunk_num_samples;
 
@@ -513,10 +512,9 @@ static int pci9111_ai_do_cmd(struct comedi_device *dev,
        }
 
        dev_private->stop_counter *= (1 + dev_private->scan_delay);
-       dev_private->chanlist_len = cmd->chanlist_len;
        dev_private->chunk_counter = 0;
-       dev_private->chunk_num_samples =
-           dev_private->chanlist_len * (1 + dev_private->scan_delay);
+       dev_private->chunk_num_samples = cmd->chanlist_len *
+                                        (1 + dev_private->scan_delay);
 
        return 0;
 }
@@ -612,9 +610,8 @@ static irqreturn_t pci9111_interrupt(int irq, void *p_device)
 
                                while (position < num_samples) {
                                        if (dev_private->chunk_counter <
-                                           dev_private->chanlist_len) {
-                                               to_read =
-                                                   dev_private->chanlist_len -
+                                           cmd->chanlist_len) {
+                                               to_read = cmd->chanlist_len -
                                                    dev_private->chunk_counter;
 
                                                if (to_read >