GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-18 12:45:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
This member of the private data is a copy of the cmd->chanlist. 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:42 -07:00 • committed by Greg Kroah-Hartman
parent 72af0c4ed5
commit bda88cd475
2 changed files with 1 additions and 3 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

@ -121,7 +121,6 @@ struct addi_private {
unsigned char b_AiContinuous; /* we do unlimited AI */ unsigned char b_AiContinuous; /* we do unlimited AI */
unsigned int ui_AiActualScan; /* how many scans we finished */ unsigned int ui_AiActualScan; /* how many scans we finished */
unsigned int ui_AiNbrofChannels; /* how many channels is measured */ unsigned int ui_AiNbrofChannels; /* how many channels is measured */
unsigned int *pui_AiChannelList; /* actual chanlist */
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_AiTimer0; /* Timer Constant for Timer0 */ unsigned int ui_AiTimer0; /* Timer Constant for Timer0 */

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

@ -901,7 +901,7 @@ static int apci3120_cyclic_ai(int mode,
/* Initializes the sequence array */ /* Initializes the sequence array */
/**********************************/ /**********************************/
if (!apci3120_setup_chan_list(dev, s, devpriv->ui_AiNbrofChannels, if (!apci3120_setup_chan_list(dev, s, devpriv->ui_AiNbrofChannels,
devpriv->pui_AiChannelList, 0)) cmd->chanlist, 0))
return -EINVAL; return -EINVAL;
us_TmpValue = (unsigned short) inw(dev->iobase + APCI3120_RD_STATUS); us_TmpValue = (unsigned short) inw(dev->iobase + APCI3120_RD_STATUS);
@ -1338,7 +1338,6 @@ static int apci3120_ai_cmd(struct comedi_device *dev,
/* loading private structure with cmd structure inputs */ /* loading private structure with cmd structure inputs */
devpriv->ui_AiNbrofChannels = cmd->chanlist_len; devpriv->ui_AiNbrofChannels = cmd->chanlist_len;
devpriv->pui_AiChannelList = cmd->chanlist;
/* UPDATE-0.7.57->0.7.68devpriv->ui_AiDataLength=s->async->data_len; */ /* UPDATE-0.7.57->0.7.68devpriv->ui_AiDataLength=s->async->data_len; */
devpriv->ui_AiDataLength = s->async->prealloc_bufsz; devpriv->ui_AiDataLength = s->async->prealloc_bufsz;