Commit a1b986e8 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 596c5a6e
......@@ -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 */
......
......@@ -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);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment