staging: comedi: addi_common.h: remove 'pui_AiChannelList' from private data
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 29 Apr 2014 19:59:42 +0000 (12:59 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 May 2014 00:06:33 +0000 (20:06 -0400)
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>
drivers/staging/comedi/drivers/addi-data/addi_common.h
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c

index 9e00410c578327666537915a59e202c733ec987e..9978f135e1414b6831b3c96d6bc1954ef9504a40 100644 (file)
@@ -121,7 +121,6 @@ struct addi_private {
        unsigned char b_AiContinuous;   /*  we do unlimited AI */
        unsigned int ui_AiActualScan;   /* how many scans we finished */
        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_AiReadData[32];
        unsigned int ui_AiTimer0;       /* Timer Constant for Timer0 */
index 502121233d7f0505f9713816265768fcce42f705..e6de79c006dee53f808ba9b4ccd5d480de894232 100644 (file)
@@ -901,7 +901,7 @@ static int apci3120_cyclic_ai(int mode,
        /* Initializes the sequence array */
    /**********************************/
        if (!apci3120_setup_chan_list(dev, s, devpriv->ui_AiNbrofChannels,
-                       devpriv->pui_AiChannelList, 0))
+                       cmd->chanlist, 0))
                return -EINVAL;
 
        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 */
        devpriv->ui_AiNbrofChannels = cmd->chanlist_len;
-       devpriv->pui_AiChannelList = cmd->chanlist;
 
        /* UPDATE-0.7.57->0.7.68devpriv->ui_AiDataLength=s->async->data_len; */
        devpriv->ui_AiDataLength = s->async->prealloc_bufsz;