diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-08-05 10:44:57 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-07 15:03:29 -0700 |
| commit | e978426116ba68069b8dd1a6492ec8a958f27218 (patch) | |
| tree | 1400888ed19841a0ddaaa9a644a89f7b9448fc05 /drivers | |
| parent | 959717a3f67a7b7ce0bded0ec7d0e7e2e74c786c (diff) | |
staging: comedi: me4000: use comedi_range_is_bipolar() in ai (*insn_read)
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/me4000.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index c7136c572a8a..c5a677a3d0da 100644 --- a/drivers/staging/comedi/drivers/me4000.c +++ b/drivers/staging/comedi/drivers/me4000.c @@ -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; |