]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: adv_pci1724: remove NUM_AO_CHANNELS define
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Thu, 20 Nov 2014 22:10:47 +0000 (15:10 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Nov 2014 23:36:40 +0000 (15:36 -0800)
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>
drivers/staging/comedi/drivers/adv_pci1724.c

index 735522876c8091183b7d858556bcae5b2e532fe6..db5f6eb7acc40ddcddcfa73880db7912a423596a 100644 (file)
@@ -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;