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

staging: comedi: rti800: tidy up CR_{CHAN,RANGE} usage

The insn->chanspec passed to the CR_{CHAN,RANGE} macros is an unsigned
int. For aesthetic reasons, put the result of the macros into an
unsigned int local var.
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 0682323c
...@@ -169,10 +169,10 @@ static int rti800_ai_insn_read(struct comedi_device *dev, ...@@ -169,10 +169,10 @@ static int rti800_ai_insn_read(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct rti800_private *devpriv = dev->private; struct rti800_private *devpriv = dev->private;
unsigned int chan = CR_CHAN(insn->chanspec);
unsigned int gain = CR_RANGE(insn->chanspec);
int i, t; int i, t;
int status; int status;
int chan = CR_CHAN(insn->chanspec);
unsigned gain = CR_RANGE(insn->chanspec);
unsigned muxgain_bits; unsigned muxgain_bits;
inb(dev->iobase + RTI800_ADCHI); inb(dev->iobase + RTI800_ADCHI);
...@@ -223,7 +223,7 @@ static int rti800_ao_insn_read(struct comedi_device *dev, ...@@ -223,7 +223,7 @@ static int rti800_ao_insn_read(struct comedi_device *dev,
unsigned int *data) unsigned int *data)
{ {
struct rti800_private *devpriv = dev->private; struct rti800_private *devpriv = dev->private;
int chan = CR_CHAN(insn->chanspec); unsigned int chan = CR_CHAN(insn->chanspec);
int i; int i;
for (i = 0; i < insn->n; i++) for (i = 0; i < insn->n; i++)
...@@ -238,7 +238,7 @@ static int rti800_ao_insn_write(struct comedi_device *dev, ...@@ -238,7 +238,7 @@ static int rti800_ao_insn_write(struct comedi_device *dev,
unsigned int *data) unsigned int *data)
{ {
struct rti800_private *devpriv = dev->private; struct rti800_private *devpriv = dev->private;
int chan = CR_CHAN(insn->chanspec); unsigned int chan = CR_CHAN(insn->chanspec);
int reg_lo = chan ? RTI800_DAC1LO : RTI800_DAC0LO; int reg_lo = chan ? RTI800_DAC1LO : RTI800_DAC0LO;
int reg_hi = chan ? RTI800_DAC1HI : RTI800_DAC0HI; int reg_hi = chan ? RTI800_DAC1HI : RTI800_DAC0HI;
int val = devpriv->ao_readback[chan]; int val = devpriv->ao_readback[chan];
......
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