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

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

This member of the private data is a copy of the s->async->prealloc_bufsz.
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 a1b986e8
...@@ -123,7 +123,6 @@ struct addi_private { ...@@ -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_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 */
unsigned char b_DmaDoubleBuffer; /* we can use double buffering */ unsigned char b_DmaDoubleBuffer; /* we can use double buffering */
......
...@@ -1152,10 +1152,10 @@ static int apci3120_cyclic_ai(int mode, ...@@ -1152,10 +1152,10 @@ static int apci3120_cyclic_ai(int mode,
dmalen1 = 4; dmalen1 = 4;
} }
} else { /* isn't output buff smaller that our DMA buff? */ } else { /* isn't output buff smaller that our DMA buff? */
if (dmalen0 > (devpriv->ui_AiDataLength)) if (dmalen0 > s->async->prealloc_bufsz)
dmalen0 = devpriv->ui_AiDataLength; dmalen0 = s->async->prealloc_bufsz;
if (dmalen1 > (devpriv->ui_AiDataLength)) if (dmalen1 > s->async->prealloc_bufsz)
dmalen1 = devpriv->ui_AiDataLength; dmalen1 = s->async->prealloc_bufsz;
} }
devpriv->ui_DmaBufferUsesize[0] = dmalen0; devpriv->ui_DmaBufferUsesize[0] = dmalen0;
devpriv->ui_DmaBufferUsesize[1] = dmalen1; devpriv->ui_DmaBufferUsesize[1] = dmalen1;
...@@ -1339,9 +1339,6 @@ static int apci3120_ai_cmd(struct comedi_device *dev, ...@@ -1339,9 +1339,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;
/* UPDATE-0.7.57->0.7.68devpriv->ui_AiDataLength=s->async->data_len; */
devpriv->ui_AiDataLength = s->async->prealloc_bufsz;
if (cmd->stop_src == TRIG_COUNT) if (cmd->stop_src == TRIG_COUNT)
devpriv->ui_AiNbrofScans = cmd->stop_arg; devpriv->ui_AiNbrofScans = cmd->stop_arg;
else else
......
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