evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
H Hartley Sweeten 2014-04-29 12:59:44 -07:00 • committed by Greg Kroah-Hartman
parent 596c5a6e76
commit a1b986e889
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/comedi/drivers/addi-data/addi_common.h
View file

@ -123,7 +123,6 @@ struct addi_private {
unsigned int ui_AiNbrofChannels; /* how many channels is measured */ unsigned int ui_AiNbrofChannels; /* how many channels is measured */
unsigned int ui_AiChannelList[32]; /* actual chanlist */ unsigned int ui_AiChannelList[32]; /* actual chanlist */
unsigned int ui_AiReadData[32]; unsigned int ui_AiReadData[32];
unsigned int ui_AiTimer1; /* Timer constant for Timer1 */
unsigned int ui_AiDataLength; unsigned int ui_AiDataLength;
unsigned int ui_AiNbrofScans; /* number of scans to do */ unsigned int ui_AiNbrofScans; /* number of scans to do */
unsigned short us_UseDma; /* To use Dma or not */ unsigned short us_UseDma; /* To use Dma or not */

4
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View file

@ -895,7 +895,7 @@ static int apci3120_cyclic_ai(int mode,
ui_ConvertTiming = cmd->convert_arg; ui_ConvertTiming = cmd->convert_arg;
if (mode == 2) if (mode == 2)
ui_DelayTiming = devpriv->ui_AiTimer1; ui_DelayTiming = cmd->scan_begin_arg;
/**********************************/ /**********************************/
/* Initializes the sequence array */ /* Initializes the sequence array */
@ -1347,7 +1347,6 @@ static int apci3120_ai_cmd(struct comedi_device *dev,
else else
devpriv->ui_AiNbrofScans = 0; devpriv->ui_AiNbrofScans = 0;
devpriv->ui_AiTimer1 = 0;
if ((devpriv->ui_AiNbrofScans == 0) || (devpriv->ui_AiNbrofScans == -1)) if ((devpriv->ui_AiNbrofScans == 0) || (devpriv->ui_AiNbrofScans == -1))
devpriv->b_AiContinuous = 1; /* user want neverending analog acquisition */ devpriv->b_AiContinuous = 1; /* user want neverending analog acquisition */
/* stopped using cancel */ /* stopped using cancel */
@ -1370,7 +1369,6 @@ static int apci3120_ai_cmd(struct comedi_device *dev,
if ((cmd->scan_begin_src == TRIG_TIMER) if ((cmd->scan_begin_src == TRIG_TIMER)
&& (cmd->convert_src == TRIG_TIMER)) { && (cmd->convert_src == TRIG_TIMER)) {
/* mode 2 */ /* mode 2 */
devpriv->ui_AiTimer1 = cmd->scan_begin_arg;
/* return this_board->ai_cmd(2,dev,s); */ /* return this_board->ai_cmd(2,dev,s); */
return apci3120_cyclic_ai(2, dev, s); return apci3120_cyclic_ai(2, dev, s);
} }