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 <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/staging/comedi/drivers/adv_pci1724.c | 8 +++-----
1 file 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;
--
2.0.3
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
