[PATCH 16/32] staging: comedi: addi_common.h: remove 'ui_AiTimer0' from private data

H Hartley Sweeten hsweeten at visionengravers.com
Tue Apr 29 19:59:43 UTC 2014


This member of the private data is a copy of the cmd->convert_arg. 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/addi-data/addi_common.h    | 1 -
 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h
index 9978f13..097d67f 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h
@@ -123,7 +123,6 @@ struct addi_private {
 	unsigned int ui_AiNbrofChannels;	/*  how many channels is measured */
 	unsigned int ui_AiChannelList[32];	/*  actual chanlist */
 	unsigned int ui_AiReadData[32];
-	unsigned int ui_AiTimer0;	/* Timer Constant for Timer0 */
 	unsigned int ui_AiTimer1;	/* Timer constant for Timer1 */
 	unsigned int ui_AiDataLength;
 	unsigned int ui_AiNbrofScans;	/*  number of scans to do */
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index e6de79c..2975b94 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -892,7 +892,7 @@ static int apci3120_cyclic_ai(int mode,
 
 	/*  value for timer2  minus -2 has to be done .....dunno y?? */
 	ui_TimerValue2 = devpriv->ui_AiNbrofScans - 2;
-	ui_ConvertTiming = devpriv->ui_AiTimer0;
+	ui_ConvertTiming = cmd->convert_arg;
 
 	if (mode == 2)
 		ui_DelayTiming = devpriv->ui_AiTimer1;
@@ -1347,7 +1347,6 @@ static int apci3120_ai_cmd(struct comedi_device *dev,
 	else
 		devpriv->ui_AiNbrofScans = 0;
 
-	devpriv->ui_AiTimer0 = 0;	/*  variables changed to timer0,timer1 */
 	devpriv->ui_AiTimer1 = 0;
 	if ((devpriv->ui_AiNbrofScans == 0) || (devpriv->ui_AiNbrofScans == -1))
 		devpriv->b_AiContinuous = 1;	/*  user want neverending analog acquisition */
@@ -1363,7 +1362,6 @@ static int apci3120_ai_cmd(struct comedi_device *dev,
 		if (cmd->convert_src == TRIG_TIMER) {
 			/*  mode 1 */
 
-			devpriv->ui_AiTimer0 = cmd->convert_arg;	/*  timer constant in nano seconds */
 			/* return this_board->ai_cmd(1,dev,s); */
 			return apci3120_cyclic_ai(1, dev, s);
 		}
@@ -1373,7 +1371,6 @@ static int apci3120_ai_cmd(struct comedi_device *dev,
 		&& (cmd->convert_src == TRIG_TIMER)) {
 		/*  mode 2 */
 		devpriv->ui_AiTimer1 = cmd->scan_begin_arg;
-		devpriv->ui_AiTimer0 = cmd->convert_arg;	/*  variable changed timer2 to timer0 */
 		/* return this_board->ai_cmd(2,dev,s); */
 		return apci3120_cyclic_ai(2, dev, s);
 	}
-- 
1.9.2



More information about the devel mailing list