Commit 3acf3176 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 05841b36
...@@ -103,8 +103,6 @@ a multiple of chanlist_len*convert_arg. ...@@ -103,8 +103,6 @@ a multiple of chanlist_len*convert_arg.
#define PCI9111_HR_AI_RESOLUTION_2_CMP_BIT 0x8000 #define PCI9111_HR_AI_RESOLUTION_2_CMP_BIT 0x8000
#define PCI9111_AI_ACQUISITION_PERIOD_MIN_NS 10000 #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_RANGE_SETTING_DELAY 10
#define PCI9111_AI_INSTANT_READ_UDELAY_US 2 #define PCI9111_AI_INSTANT_READ_UDELAY_US 2
...@@ -1238,7 +1236,7 @@ static int pci9111_attach(struct comedi_device *dev, ...@@ -1238,7 +1236,7 @@ static int pci9111_attach(struct comedi_device *dev,
s = &dev->subdevices[2]; s = &dev->subdevices[2];
s->type = COMEDI_SUBD_DI; s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE; s->subdev_flags = SDF_READABLE;
s->n_chan = PCI9111_DI_CHANNEL_NBR; s->n_chan = 16;
s->maxdata = 1; s->maxdata = 1;
s->range_table = &range_digital; s->range_table = &range_digital;
s->insn_bits = pci9111_di_insn_bits; s->insn_bits = pci9111_di_insn_bits;
...@@ -1246,7 +1244,7 @@ static int pci9111_attach(struct comedi_device *dev, ...@@ -1246,7 +1244,7 @@ static int pci9111_attach(struct comedi_device *dev,
s = &dev->subdevices[3]; s = &dev->subdevices[3];
s->type = COMEDI_SUBD_DO; s->type = COMEDI_SUBD_DO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE; s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = PCI9111_DO_CHANNEL_NBR; s->n_chan = 16;
s->maxdata = 1; s->maxdata = 1;
s->range_table = &range_digital; s->range_table = &range_digital;
s->insn_bits = pci9111_do_insn_bits; s->insn_bits = pci9111_do_insn_bits;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment