From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 29 Apr 2014 19:59:44 +0000 (-0700)
Subject: staging: comedi: addi_common.h: remove 'ui_AiTimer1' from private data
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a1b986e88976e2ca566fa2726c2346b5fbd1903c;p=openwrt%2Fstaging%2Fblogic.git

staging: comedi: addi_common.h: remove 'ui_AiTimer1' from private data

This member of the private data is a copy of the cmd->scan_begin_arg.
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>
---

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h
index 097d67f430a2..b54819bbb10b 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_AiTimer1;	/* Timer constant for Timer1 */
 	unsigned int ui_AiDataLength;
 	unsigned int ui_AiNbrofScans;	/*  number of scans to do */
 	unsigned short us_UseDma;	/*  To use Dma or not */
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 2975b94f40dd..8f6f1522536e 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -895,7 +895,7 @@ static int apci3120_cyclic_ai(int mode,
 	ui_ConvertTiming = cmd->convert_arg;
 
 	if (mode == 2)
-		ui_DelayTiming = devpriv->ui_AiTimer1;
+		ui_DelayTiming = cmd->scan_begin_arg;
 
    /**********************************/
 	/* Initializes the sequence array */
@@ -1347,7 +1347,6 @@ static int apci3120_ai_cmd(struct comedi_device *dev,
 	else
 		devpriv->ui_AiNbrofScans = 0;
 
-	devpriv->ui_AiTimer1 = 0;
 	if ((devpriv->ui_AiNbrofScans == 0) || (devpriv->ui_AiNbrofScans == -1))
 		devpriv->b_AiContinuous = 1;	/*  user want neverending analog acquisition */
 	/*  stopped using cancel */
@@ -1370,7 +1369,6 @@ static int apci3120_ai_cmd(struct comedi_device *dev,
 	if ((cmd->scan_begin_src == TRIG_TIMER)
 		&& (cmd->convert_src == TRIG_TIMER)) {
 		/*  mode 2 */
-		devpriv->ui_AiTimer1 = cmd->scan_begin_arg;
 		/* return this_board->ai_cmd(2,dev,s); */
 		return apci3120_cyclic_ai(2, dev, s);
 	}