Commit 4d486e75 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: adv_pci1710: remove 'ai_flags' from private data

This member of the private data is just a copy of the cmd->flags. Use
that instead.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cd0164e6
...@@ -317,7 +317,6 @@ struct pci1710_private { ...@@ -317,7 +317,6 @@ struct pci1710_private {
unsigned int ai_scans; /* len of scanlist */ unsigned int ai_scans; /* len of scanlist */
unsigned int ai_n_chan; /* how many channels is measured */ unsigned int ai_n_chan; /* how many channels is measured */
unsigned int *ai_chanlist; /* actaul chanlist */ unsigned int *ai_chanlist; /* actaul chanlist */
unsigned int ai_flags; /* flaglist */
unsigned int ai_data_len; /* len of data buffer */ unsigned int ai_data_len; /* len of data buffer */
unsigned short ao_data[4]; /* data output buffer */ unsigned short ao_data[4]; /* data output buffer */
unsigned int cnt0_write_wait; /* after a write, wait for update of the unsigned int cnt0_write_wait; /* after a write, wait for update of the
...@@ -981,7 +980,7 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev, ...@@ -981,7 +980,7 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev,
devpriv->CntrlReg &= Control_CNT0; devpriv->CntrlReg &= Control_CNT0;
/* don't we want wake up every scan? devpriv->ai_eos=1; */ /* don't we want wake up every scan? devpriv->ai_eos=1; */
if ((devpriv->ai_flags & TRIG_WAKE_EOS)) { if (cmd->flags & TRIG_WAKE_EOS) {
devpriv->ai_eos = 1; devpriv->ai_eos = 1;
} else { } else {
devpriv->CntrlReg |= Control_ONEFH; devpriv->CntrlReg |= Control_ONEFH;
...@@ -1010,7 +1009,7 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev, ...@@ -1010,7 +1009,7 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev,
i8253_cascade_ns_to_timer(devpriv->i8254_osc_base, i8253_cascade_ns_to_timer(devpriv->i8254_osc_base,
&divisor1, &divisor2, &divisor1, &divisor2,
&cmd->convert_arg, &cmd->convert_arg,
devpriv->ai_flags); cmd->flags);
outw(devpriv->CntrlReg, dev->iobase + PCI171x_CONTROL); outw(devpriv->CntrlReg, dev->iobase + PCI171x_CONTROL);
if (mode != 2) { if (mode != 2) {
/* start pacer */ /* start pacer */
...@@ -1122,7 +1121,6 @@ static int pci171x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -1122,7 +1121,6 @@ static int pci171x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
devpriv->ai_n_chan = cmd->chanlist_len; devpriv->ai_n_chan = cmd->chanlist_len;
devpriv->ai_chanlist = cmd->chanlist; devpriv->ai_chanlist = cmd->chanlist;
devpriv->ai_flags = cmd->flags;
devpriv->ai_data_len = s->async->prealloc_bufsz; devpriv->ai_data_len = s->async->prealloc_bufsz;
if (cmd->stop_src == TRIG_COUNT) if (cmd->stop_src == TRIG_COUNT)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment