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

staging: comedi: adl_pci9118: remove 'ai_chanlist' from private data

This member of the private data is just a copy of the cmd->chanlist.
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 0642d080
...@@ -340,7 +340,6 @@ struct pci9118_private { ...@@ -340,7 +340,6 @@ struct pci9118_private {
* how many channels we must add * how many channels we must add
* before scan to satisfy DMA? * before scan to satisfy DMA?
*/ */
unsigned int *ai_chanlist; /* actual chanlist */
unsigned int ai_timer1; unsigned int ai_timer1;
unsigned int ai_timer2; unsigned int ai_timer2;
unsigned int ai_flags; unsigned int ai_flags;
...@@ -1617,7 +1616,6 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -1617,7 +1616,6 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
devpriv->ai12_startstop = 0; devpriv->ai12_startstop = 0;
devpriv->ai_flags = cmd->flags; devpriv->ai_flags = cmd->flags;
devpriv->ai_n_scanlen = cmd->scan_end_arg; devpriv->ai_n_scanlen = cmd->scan_end_arg;
devpriv->ai_chanlist = cmd->chanlist;
devpriv->ai_data_len = s->async->prealloc_bufsz; devpriv->ai_data_len = s->async->prealloc_bufsz;
devpriv->ai_timer1 = 0; devpriv->ai_timer1 = 0;
devpriv->ai_timer2 = 0; devpriv->ai_timer2 = 0;
...@@ -1741,11 +1739,11 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -1741,11 +1739,11 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
/* check and setup channel list */ /* check and setup channel list */
if (!check_channel_list(dev, s, cmd->chanlist_len, 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)) devpriv->ai_add_back))
return -EINVAL; return -EINVAL;
if (!setup_channel_list(dev, s, cmd->chanlist_len, 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->ai_add_back, devpriv->usedma,
devpriv->useeoshandle)) devpriv->useeoshandle))
return -EINVAL; return -EINVAL;
......
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