From 3acf31763f3e499b6ba9a1eaabb98a1922883e55 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten <hartleys@visionengravers.com> Date: Mon, 10 Sep 2012 18:58:00 -0700 Subject: [PATCH] staging: comedi: adl_pci9111: digital input/output subdevices are fixed The digital input and output subdevices are the same for all boards supported by this driver. Remove the defines just open-code the values in the attach function. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/staging/comedi/drivers/adl_pci9111.c | 26 +++++++++----------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c index 08f7e677f6ee..349ca0e2ba65 100644 --- a/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/drivers/staging/comedi/drivers/adl_pci9111.c @@ -103,8 +103,6 @@ TODO: #define PCI9111_HR_AI_RESOLUTION_2_CMP_BIT 0x8000 #define PCI9111_AI_ACQUISITION_PERIOD_MIN_NS 10000 -#define PCI9111_DI_CHANNEL_NBR 16 -#define PCI9111_DO_CHANNEL_NBR 16 #define PCI9111_RANGE_SETTING_DELAY 10 #define PCI9111_AI_INSTANT_READ_UDELAY_US 2 @@ -1236,20 +1234,20 @@ static int pci9111_attach(struct comedi_device *dev, s->insn_read = pci9111_ao_insn_read; s = &dev->subdevices[2]; - s->type = COMEDI_SUBD_DI; - s->subdev_flags = SDF_READABLE; - s->n_chan = PCI9111_DI_CHANNEL_NBR; - s->maxdata = 1; - s->range_table = &range_digital; - s->insn_bits = pci9111_di_insn_bits; + s->type = COMEDI_SUBD_DI; + s->subdev_flags = SDF_READABLE; + s->n_chan = 16; + s->maxdata = 1; + s->range_table = &range_digital; + s->insn_bits = pci9111_di_insn_bits; s = &dev->subdevices[3]; - s->type = COMEDI_SUBD_DO; - s->subdev_flags = SDF_READABLE | SDF_WRITABLE; - s->n_chan = PCI9111_DO_CHANNEL_NBR; - s->maxdata = 1; - s->range_table = &range_digital; - s->insn_bits = pci9111_do_insn_bits; + s->type = COMEDI_SUBD_DO; + s->subdev_flags = SDF_READABLE | SDF_WRITABLE; + s->n_chan = 16; + s->maxdata = 1; + s->range_table = &range_digital; + s->insn_bits = pci9111_do_insn_bits; dev_private->is_valid = 1; -- 2.34.1