[PATCH 50/87] staging: comedi: pcl816: remove 'ai_n_chan' from private data

[H Hartley Sweeten]

This member of the private data is just a copy of the cmd->chanlist_len.

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/pcl816.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/pcl816.c 
b/drivers/staging/comedi/drivers/pcl816.c
index 649770f..3074da3 100644
--- a/drivers/staging/comedi/drivers/pcl816.c
+++ b/drivers/staging/comedi/drivers/pcl816.c
@@ -128,7 +128,6 @@ struct pcl816_private {
        unsigned int ai_act_chanlist[16];       /*  MUX setting for actual AI 
operations */
        unsigned int ai_act_chanlist_len;       /*  how long is actual MUX list 
*/
        unsigned int ai_act_chanlist_pos;       /*  actual position in MUX list 
*/
-       unsigned int ai_n_chan;         /*  how many channels per scan */
        unsigned int ai_poll_ptr;       /*  how many sampes transfer poll */
 };
 
@@ -248,7 +247,7 @@ static irqreturn_t interrupt_pcl816_ai_mode13_int(int irq, 
void *d)
                devpriv->ai_act_chanlist_pos = 0;
 
        s->async->cur_chan++;
-       if (s->async->cur_chan >= devpriv->ai_n_chan) {
+       if (s->async->cur_chan >= cmd->chanlist_len) {
                s->async->cur_chan = 0;
                devpriv->ai_act_scan++;
        }
@@ -289,7 +288,7 @@ static void transfer_from_dma_buf(struct comedi_device *dev,
                }
 
                s->async->cur_chan++;
-               if (s->async->cur_chan >= devpriv->ai_n_chan) {
+               if (s->async->cur_chan >= cmd->chanlist_len) {
                        s->async->cur_chan = 0;
                        devpriv->ai_act_scan++;
                }
@@ -505,7 +504,6 @@ static int pcl816_ai_cmd(struct comedi_device *dev, struct 
comedi_subdevice *s)
        setup_channel_list(dev, s, cmd->chanlist, seglen);
        udelay(1);
 
-       devpriv->ai_n_chan = cmd->chanlist_len;
        devpriv->ai_act_scan = 0;
        s->async->cur_chan = 0;
        devpriv->irq_blocked = 1;
-- 
1.8.5.2

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel