From: H Hartley Sweeten Date: Mon, 17 Feb 2014 21:27:26 +0000 (-0700) Subject: staging: comedi: pcl812: remove 'ai_flags' from private data X-Git-Tag: firefly_0821_release~176^2~4193^2~956 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7c2686b5a58ec8bd397480305963000f2e3ba5e3;p=firefly-linux-kernel-4.4.55.git staging: comedi: pcl812: remove 'ai_flags' from private data This member of the private data is just a copy of the cmd->flags. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c index 4d9cc391b0a7..b2a5a43047e6 100644 --- a/drivers/staging/comedi/drivers/pcl812.c +++ b/drivers/staging/comedi/drivers/pcl812.c @@ -521,7 +521,6 @@ struct pcl812_private { 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_flags; /* flaglist */ unsigned int ai_data_len; /* len of data buffer */ unsigned long dmabuf[2]; /* PTR to DMA buf */ unsigned int dmapages[2]; /* how many pages we have allocated */ @@ -787,7 +786,6 @@ static int pcl812_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) } else devpriv->ai_dma = 0; - devpriv->ai_flags = cmd->flags; devpriv->ai_data_len = s->async->prealloc_bufsz; if (cmd->stop_src == TRIG_COUNT) devpriv->ai_neverending = 0; @@ -799,7 +797,7 @@ static int pcl812_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) s->async->cur_chan = 0; /* don't we want wake up every scan? */ - if ((devpriv->ai_flags & TRIG_WAKE_EOS)) { + if (cmd->flags & TRIG_WAKE_EOS) { devpriv->ai_eos = 1; /* DMA is useless for this situation */