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

staging: comedi: adl_pci9111: use local variables for the chan/range

Simplify the chan/range in pci9111_ai_insn_read() by using local
variables for hold the values and by just passing insn->chanspec
to the CR_* macros instead of using (&insn->chanspec)[0].
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9852d137
...@@ -855,16 +855,18 @@ static int pci9111_ai_insn_read(struct comedi_device *dev, ...@@ -855,16 +855,18 @@ static int pci9111_ai_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
unsigned int chan = CR_CHAN(insn->chanspec);
unsigned int range = CR_RANGE(insn->chanspec);
unsigned int maxdata = s->maxdata; unsigned int maxdata = s->maxdata;
unsigned int invert = (maxdata + 1) >> 1; unsigned int invert = (maxdata + 1) >> 1;
unsigned int shift = (maxdata == 0xffff) ? 0 : 4; unsigned int shift = (maxdata == 0xffff) ? 0 : 4;
int timeout; int timeout;
int i; int i;
pci9111_ai_channel_set(CR_CHAN((&insn->chanspec)[0])); pci9111_ai_channel_set(chan);
if ((pci9111_ai_range_get()) != CR_RANGE((&insn->chanspec)[0])) if ((pci9111_ai_range_get()) != range)
pci9111_ai_range_set(CR_RANGE((&insn->chanspec)[0])); pci9111_ai_range_set(range);
pci9111_fifo_reset(); pci9111_fifo_reset();
......
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