diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-12-10 02:30:39 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 22:01:50 +0400 |
| commit | f9ec4efd3c5ffd9b9ea58fe85b395c54600006b6 (patch) | |
| tree | 0c9503e19192f0e5a46c9ab5a1e62a76345f18d4 | |
| parent | 7645694c697cb0425a3590620d0673aa88dc6105 (diff) | |
| download | linux-f9ec4efd3c5ffd9b9ea58fe85b395c54600006b6.tar.xz | |
staging: comedi: pcmmio: cleanup comedi_lrange tables
Use the BIP_RANGE and UNI_RANGE macros where appropriate instead of
the more generic RANGE macro.
Rename the range tables so they have namespace associated with the
driver.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/pcmmio.c | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c index a27992098916..9394782fb74b 100644 --- a/drivers/staging/comedi/drivers/pcmmio.c +++ b/drivers/staging/comedi/drivers/pcmmio.c @@ -142,13 +142,24 @@ Configuration Options: #define PAGE_ENAB 2 #define PAGE_INT_ID 3 -static const struct comedi_lrange ranges_ai = { - 4, {RANGE(-5., 5.), RANGE(-10., 10.), RANGE(0., 5.), RANGE(0., 10.)} +static const struct comedi_lrange pcmmio_ai_ranges = { + 4, { + BIP_RANGE(5), + BIP_RANGE(10), + UNI_RANGE(5), + UNI_RANGE(10) + } }; -static const struct comedi_lrange ranges_ao = { - 6, {RANGE(0., 5.), RANGE(0., 10.), RANGE(-5., 5.), RANGE(-10., 10.), - RANGE(-2.5, 2.5), RANGE(-2.5, 7.5)} +static const struct comedi_lrange pcmmio_ao_ranges = { + 6, { + UNI_RANGE(5), + UNI_RANGE(10), + BIP_RANGE(5), + BIP_RANGE(10), + BIP_RANGE(2.5), + RANGE(-2.5, 7.5) + } }; /* this structure is for data unique to this subdevice. */ @@ -960,7 +971,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it) s = &dev->subdevices[0]; s->private = &devpriv->sprivs[0]; s->maxdata = 0xffff; - s->range_table = &ranges_ai; + s->range_table = &pcmmio_ai_ranges; s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF; s->type = COMEDI_SUBD_AI; s->n_chan = 16; @@ -975,7 +986,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it) s = &dev->subdevices[1]; s->private = &devpriv->sprivs[1]; s->maxdata = 0xffff; - s->range_table = &ranges_ao; + s->range_table = &pcmmio_ao_ranges; s->subdev_flags = SDF_READABLE; s->type = COMEDI_SUBD_AO; s->n_chan = 8; |