diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-20 15:10:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 15:36:40 -0800 |
| commit | 21cdf8f43b85a9e6c9905dbeb401e4a4d1c8a6c3 (patch) | |
| tree | f40e5fcdf7c6b77c5fdae48513ddefa790a1bba2 /drivers/staging/comedi | |
| parent | 5081162d6c6b93ace4039da13571149268ba74ba (diff) | |
| download | op-kernel-dev-21cdf8f43b85a9e6c9905dbeb401e4a4d1c8a6c3.zip op-kernel-dev-21cdf8f43b85a9e6c9905dbeb401e4a4d1c8a6c3.tar.gz | |
staging: comedi: adv_pci1724: remove NUM_AO_CHANNELS define
This define is now only used to set each of the subdevice 'n_chan'. For
clarity, remove the define and open code the values.
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/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/adv_pci1724.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1724.c b/drivers/staging/comedi/drivers/adv_pci1724.c index 7355228..db5f6eb 100644 --- a/drivers/staging/comedi/drivers/adv_pci1724.c +++ b/drivers/staging/comedi/drivers/adv_pci1724.c @@ -60,8 +60,6 @@ supported PCI devices are configured as comedi devices automatically. #define PCI_VENDOR_ID_ADVANTECH 0x13fe -#define NUM_AO_CHANNELS 32 - /* register offsets */ enum board_registers { DAC_CONTROL_REG = 0x0, @@ -236,7 +234,7 @@ static int setup_subdevices(struct comedi_device *dev) s = &dev->subdevices[0]; s->type = COMEDI_SUBD_AO; s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_GROUND; - s->n_chan = NUM_AO_CHANNELS; + s->n_chan = 32; s->maxdata = 0x3fff; s->range_table = &ao_ranges_1724; s->insn_write = ao_winsn; @@ -249,7 +247,7 @@ static int setup_subdevices(struct comedi_device *dev) s = &dev->subdevices[1]; s->type = COMEDI_SUBD_CALIB; s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL; - s->n_chan = NUM_AO_CHANNELS; + s->n_chan = 32; s->maxdata = 0x3fff; s->insn_write = offset_write_insn; @@ -261,7 +259,7 @@ static int setup_subdevices(struct comedi_device *dev) s = &dev->subdevices[2]; s->type = COMEDI_SUBD_CALIB; s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL; - s->n_chan = NUM_AO_CHANNELS; + s->n_chan = 32; s->maxdata = 0x3fff; s->insn_write = gain_write_insn; |
