iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: me4000: use comedi_range_is_bipolar() in ai (*insn_read)

Browse Source 
Use the helper function to check the range type instead of relying on the
value. For aesthetics, rename the local variable used for the range.

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 2015-08-05 10:44:57 -07:00 committed by Greg Kroah-Hartman
parent 959717a3f6
commit e978426116
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/comedi/drivers/me4000.c
View File

@ -452,15 +452,14 @@ static int me4000_ai_insn_read(struct comedi_device *dev,
unsigned int *data)
{
unsigned int chan = CR_CHAN(insn->chanspec);
unsigned int rang = CR_RANGE(insn->chanspec);
unsigned int range = CR_RANGE(insn->chanspec);
unsigned int aref = CR_AREF(insn->chanspec);
unsigned int entry = 0;
unsigned int entry;
unsigned int tmp;
int ret;
int i;
entry |= ME4000_AI_LIST_RANGE(rang);
entry |= chan;
entry = chan | ME4000_AI_LIST_RANGE(range);
if (aref == AREF_DIFF) {
if (!(s->subdev_flags && SDF_DIFF)) {
dev_err(dev->class_dev,
@ -468,7 +467,7 @@ static int me4000_ai_insn_read(struct comedi_device *dev,
return -EINVAL;
}
if (rang == 0 || rang == 1) {
if (!comedi_range_is_bipolar(s, range)) {
dev_err(dev->class_dev,
"Range must be bipolar when aref = diff\n");
return -EINVAL;