evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: pcl812: remove 'ai_neverending' from private data

Browse source 
This member of the private data is not needed. We can check the stop_src
to determine this information:

  ai_neverending -> cmd->stop_src == TRIG_NONE
  !ai_neverending -> cmd->stop_src == TRIG_COUNT

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>
This commit is contained in:
H Hartley Sweeten 2014-03-04 11:29:24 -07:00 • committed by Greg Kroah-Hartman
parent 80cc64863a
commit be40b46d6a
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/staging/comedi/drivers/pcl812.c
View file

@ -529,7 +529,6 @@ struct pcl812_private {
unsigned int use_ext_trg:1; unsigned int use_ext_trg:1;
unsigned int ai_dma:1; unsigned int ai_dma:1;
unsigned int ai_eos:1; unsigned int ai_eos:1;
unsigned int ai_neverending:1;
}; };
static void setup_range_channel(struct comedi_device *dev, static void setup_range_channel(struct comedi_device *dev,
@ -768,11 +767,6 @@ static int pcl812_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
devpriv->ai_dma = 0; devpriv->ai_dma = 0;
devpriv->ai_data_len = s->async->prealloc_bufsz; devpriv->ai_data_len = s->async->prealloc_bufsz;
if (cmd->stop_src == TRIG_COUNT)
devpriv->ai_neverending = 0;
else
devpriv->ai_neverending = 1;
devpriv->ai_act_scan = 0; devpriv->ai_act_scan = 0;
devpriv->ai_poll_ptr = 0; devpriv->ai_poll_ptr = 0;
s->async->cur_chan = 0; s->async->cur_chan = 0;
@ -803,7 +797,7 @@ static int pcl812_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
devpriv->dmabytestomove[1] = devpriv->dmabytestomove[1] =
devpriv->ai_data_len; devpriv->ai_data_len;
} }
if (devpriv->ai_neverending) { if (cmd->stop_src == TRIG_NONE) {
devpriv->dma_runs_to_end = 1; devpriv->dma_runs_to_end = 1;
} else { } else {
/* how many samples we must transfer? */ /* how many samples we must transfer? */
@ -908,12 +902,12 @@ static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d)
s->async->cur_chan = next_chan; s->async->cur_chan = next_chan;
if (next_chan == 0) { /* one scan done */ if (next_chan == 0) { /* one scan done */
devpriv->ai_act_scan++; devpriv->ai_act_scan++;
if (!(devpriv->ai_neverending)) if (cmd->stop_src == TRIG_COUNT &&
/* all data sampled */ devpriv->ai_act_scan >= cmd->stop_arg) {
if (devpriv->ai_act_scan >= cmd->stop_arg) { /* all data sampled */
s->cancel(dev, s); s->cancel(dev, s);
s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_EOA;
} }
} }
comedi_event(dev, s); comedi_event(dev, s);
@ -938,13 +932,13 @@ static void transfer_from_dma_buf(struct comedi_device *dev,
if (s->async->cur_chan >= cmd->chanlist_len) { if (s->async->cur_chan >= cmd->chanlist_len) {
s->async->cur_chan = 0; s->async->cur_chan = 0;
devpriv->ai_act_scan++; devpriv->ai_act_scan++;
if (!devpriv->ai_neverending) if (cmd->stop_src == TRIG_COUNT &&
/* all data sampled */ devpriv->ai_act_scan >= cmd->stop_arg) {
if (devpriv->ai_act_scan >= cmd->stop_arg) { /* all data sampled */
s->cancel(dev, s); s->cancel(dev, s);
s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_EOA;
break; break;
} }
} }
} }