diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-02-17 14:27:45 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 11:56:50 -0800 |
| commit | 4e2008616f25f7bf6a5be484d4d5d5e73d055f69 (patch) | |
| tree | 48939699e41a2add13ac32feee9ed9f1cb68c623 | |
| parent | 7b822d011be55d1dec906fd857a5fdeef6e308ee (diff) | |
staging: comedi: pcl812: 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: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/pcl812.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c index d0708f8326df..8728a90e543b 100644 --- a/drivers/staging/comedi/drivers/pcl812.c +++ b/drivers/staging/comedi/drivers/pcl812.c @@ -517,7 +517,6 @@ struct pcl812_private { unsigned char ai_dma; /* =1 we use DMA */ unsigned int ai_poll_ptr; /* how many sampes transfer poll */ unsigned int ai_act_scan; /* how many scans we finished */ - unsigned int ai_chanlist[MAX_CHANLIST_LEN]; /* our copy of channel/range list */ unsigned int ai_data_len; /* len of data buffer */ unsigned int dmapages; unsigned int hwdmasize; @@ -769,15 +768,13 @@ static int pcl812_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) pcl812_start_pacer(dev, false); - memcpy(devpriv->ai_chanlist, cmd->chanlist, - sizeof(unsigned int) * cmd->scan_end_arg); /* select first channel and range */ - setup_range_channel(dev, s, devpriv->ai_chanlist[0], 1); + setup_range_channel(dev, s, cmd->chanlist[0], 1); if (devpriv->dma) { /* check if we can use DMA transfer */ devpriv->ai_dma = 1; for (i = 1; i < cmd->chanlist_len; i++) - if (devpriv->ai_chanlist[0] != devpriv->ai_chanlist[i]) { + if (cmd->chanlist[0] != cmd->chanlist[i]) { /* we cann't use DMA :-( */ devpriv->ai_dma = 0; break; @@ -921,9 +918,8 @@ static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d) next_chan = s->async->cur_chan + 1; if (next_chan >= cmd->chanlist_len) next_chan = 0; - if (devpriv->ai_chanlist[s->async->cur_chan] != - devpriv->ai_chanlist[next_chan]) - setup_range_channel(dev, s, devpriv->ai_chanlist[next_chan], 0); + if (cmd->chanlist[s->async->cur_chan] != cmd->chanlist[next_chan]) + setup_range_channel(dev, s, cmd->chanlist[next_chan], 0); outb(0, dev->iobase + PCL812_CLRINT); /* clear INT request */ |