From: H Hartley Sweeten Date: Wed, 19 Feb 2014 17:11:25 +0000 (-0700) Subject: staging: comedi: pcl816: remove 'ai_act_chanlist_{len, pos}' from private data X-Git-Tag: firefly_0821_release~176^2~4193^2~919 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0f9c4c7e38c7e1f6669093e8220067fafb8dcae6;p=firefly-linux-kernel-4.4.55.git staging: comedi: pcl816: remove 'ai_act_chanlist_{len, pos}' from private data These members of the private data don't do anything usefull. Just remove them. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c index 0d2eaa9fc04c..54d75a7f866e 100644 --- a/drivers/staging/comedi/drivers/pcl816.c +++ b/drivers/staging/comedi/drivers/pcl816.c @@ -122,8 +122,6 @@ struct pcl816_private { int int816_mode; /* who now uses IRQ - 1=AI1 int, 2=AI1 dma, 3=AI3 int, 4AI3 dma */ int ai_act_scan; /* how many scans we finished */ 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_poll_ptr; /* how many sampes transfer poll */ unsigned int divisor1; unsigned int divisor2; @@ -251,9 +249,6 @@ static irqreturn_t interrupt_pcl816_ai_mode13_int(int irq, void *d) outb(0, dev->iobase + PCL816_CLRINT); /* clear INT request */ - if (++devpriv->ai_act_chanlist_pos >= devpriv->ai_act_chanlist_len) - devpriv->ai_act_chanlist_pos = 0; - s->async->cur_chan++; if (s->async->cur_chan >= cmd->chanlist_len) { s->async->cur_chan = 0; @@ -290,11 +285,6 @@ static void transfer_from_dma_buf(struct comedi_device *dev, comedi_buf_put(s->async, ptr[bufptr++]); - if (++devpriv->ai_act_chanlist_pos >= - devpriv->ai_act_chanlist_len) { - devpriv->ai_act_chanlist_pos = 0; - } - s->async->cur_chan++; if (s->async->cur_chan >= cmd->chanlist_len) { s->async->cur_chan = 0; @@ -769,9 +759,6 @@ setup_channel_list(struct comedi_device *dev, struct pcl816_private *devpriv = dev->private; unsigned int i; - devpriv->ai_act_chanlist_len = seglen; - devpriv->ai_act_chanlist_pos = 0; - for (i = 0; i < seglen; i++) { /* store range list to card */ devpriv->ai_act_chanlist[i] = CR_CHAN(chanlist[i]); outb(CR_CHAN(chanlist[0]) & 0xf, dev->iobase + PCL816_MUX);