[PATCH 3/4] staging: comedi: adl_pc19111: remove 'chanlist_len' from private data

H Hartley Sweeten hsweeten at visionengravers.com
Mon May 5 16:48:19 UTC 2014


This member of the private data is a copy of the cmd->chanlist_len. Use
that instead.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/adl_pci9111.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index 7596b4e..c84930c 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 >
-- 
1.9.2



More information about the devel mailing list