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: 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 b54819bbb10ba8d15450f0ff730bc4f8e216f076..a2208e7a360564753fb00be0176364f0feb95b6a 100644 (file)
--- 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_AiDataLength;
        unsigned int ui_AiNbrofScans;   /*  number of scans to do */
        unsigned short us_UseDma;       /*  To use Dma or not */
        unsigned char b_DmaDoubleBuffer;        /*  we can use double buffering */

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 8f6f1522536ea0fa6b647a3b8f66112766cfb96c..cd8e9335aa6e1c1563a98eb1f0f981387848cc5b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -1152,10 +1152,10 @@ static int apci3120_cyclic_ai(int mode,
                                        dmalen1 = 4;
                        }
                } else {        /*  isn't output buff smaller that our DMA buff? */
-                       if (dmalen0 > (devpriv->ui_AiDataLength))
-                               dmalen0 = devpriv->ui_AiDataLength;
-                       if (dmalen1 > (devpriv->ui_AiDataLength))
-                               dmalen1 = devpriv->ui_AiDataLength;
+                       if (dmalen0 > s->async->prealloc_bufsz)
+                               dmalen0 = s->async->prealloc_bufsz;
+                       if (dmalen1 > s->async->prealloc_bufsz)
+                               dmalen1 = s->async->prealloc_bufsz;
                }
                devpriv->ui_DmaBufferUsesize[0] = dmalen0;
                devpriv->ui_DmaBufferUsesize[1] = dmalen1;
@@ -1339,9 +1339,6 @@ static int apci3120_ai_cmd(struct comedi_device *dev,
        /* loading private structure with cmd structure inputs */
        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)
                devpriv->ui_AiNbrofScans = cmd->stop_arg;
        else