staging: comedi: adl_pci9118: remove 'ai_chanlist' from private data
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 5 May 2014 16:35:30 +0000 (09:35 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 May 2014 12:18:53 +0000 (21:18 +0900)
This member of the private data is just 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/adl_pci9118.c

index 6b64484c6ced65ffe7d5d3cc14798203347309b7..cc56da4fe857613755baadb427bef920b8ec00e4 100644 (file)
@@ -340,7 +340,6 @@ struct pci9118_private {
                                         * how many channels we must add
                                         * before scan to satisfy DMA?
                                         */
-       unsigned int *ai_chanlist;      /* actual chanlist */
        unsigned int ai_timer1;
        unsigned int ai_timer2;
        unsigned int ai_flags;
@@ -1617,7 +1616,6 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
        devpriv->ai12_startstop = 0;
        devpriv->ai_flags = cmd->flags;
        devpriv->ai_n_scanlen = cmd->scan_end_arg;
-       devpriv->ai_chanlist = cmd->chanlist;
        devpriv->ai_data_len = s->async->prealloc_bufsz;
        devpriv->ai_timer1 = 0;
        devpriv->ai_timer2 = 0;
@@ -1741,11 +1739,11 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
        /* check and setup channel list */
        if (!check_channel_list(dev, s, cmd->chanlist_len,
-                               devpriv->ai_chanlist, devpriv->ai_add_front,
+                               cmd->chanlist, devpriv->ai_add_front,
                                devpriv->ai_add_back))
                return -EINVAL;
        if (!setup_channel_list(dev, s, cmd->chanlist_len,
-                               devpriv->ai_chanlist, 0, devpriv->ai_add_front,
+                               cmd->chanlist, 0, devpriv->ai_add_front,
                                devpriv->ai_add_back, devpriv->usedma,
                                devpriv->useeoshandle))
                return -EINVAL;