Skip to content

Commit

Permalink
staging: comedi: adl_pci9111: digital input/output subdevices are fixed
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 11, 2012
1 parent 05841b3 commit 3acf317
Showing 1 changed file with 12 additions and 14 deletions.
26 changes: 12 additions & 14 deletions drivers/staging/comedi/drivers/adl_pci9111.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ a multiple of chanlist_len*convert_arg.
#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
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 3acf317

Please sign in to comment.