diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-05-05 09:48:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-23 21:21:30 +0900 |
| commit | cae5c9fb97596e2caf2fd081a43b0d1f302fdcd8 (patch) | |
| tree | 0c19f44bb8072fd4f1c9dd9f689e52747b9a256e /drivers/staging/comedi/drivers/adl_pci9111.c | |
| parent | 8eb18913e16db9c0915bd4e7374608588d3477f2 (diff) | |
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 <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/adl_pci9111.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/adl_pci9111.c | 11 |
1 files changed, 4 insertions, 7 deletions
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 > |