From: H Hartley Sweeten Date: Mon, 5 May 2014 16:48:19 +0000 (-0700) Subject: staging: comedi: adl_pc19111: remove 'chanlist_len' from private data X-Git-Tag: firefly_0821_release~176^2~3465^2~39^2~479 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cae5c9fb97596e2caf2fd081a43b0d1f302fdcd8;p=firefly-linux-kernel-4.4.55.git staging: comedi: adl_pc19111: remove 'chanlist_len' from private data This member of the private data is a copy of the cmd->chanlist_len. Use that instead. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c index 7596b4e8a96b..c84930ca8040 100644 --- a/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/drivers/staging/comedi/drivers/adl_pci9111.c @@ -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 >