Commit cffd83b6 authored by Chase Southwood's avatar Chase Southwood Committed by Greg Kroah-Hartman

staging: comedi: addi_apci_1564: board has 32 digital inputs

This board always has 32 digital inputs. Remove the test when
initializing the subdevice.

Also, since this board is the only one supported by this driver,
remove the boardinfo about the digital inputs and just use the
data directly in the subdevice init.
Signed-off-by: default avatarChase Southwood <chase.southwood@gmail.com>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6aa4f14c
...@@ -20,8 +20,6 @@ static const struct addi_board apci1564_boardtypes[] = { ...@@ -20,8 +20,6 @@ static const struct addi_board apci1564_boardtypes[] = {
.i_Timer = 1, .i_Timer = 1,
.interrupt = apci1564_interrupt, .interrupt = apci1564_interrupt,
.reset = apci1564_reset, .reset = apci1564_reset,
.di_config = apci1564_di_config,
.di_bits = apci1564_di_insn_bits,
.do_config = apci1564_do_config, .do_config = apci1564_do_config,
.do_bits = apci1564_do_insn_bits, .do_bits = apci1564_do_insn_bits,
.do_read = apci1564_do_read, .do_read = apci1564_do_read,
...@@ -115,21 +113,15 @@ static int apci1564_auto_attach(struct comedi_device *dev, ...@@ -115,21 +113,15 @@ static int apci1564_auto_attach(struct comedi_device *dev,
/* Allocate and Initialise DI Subdevice Structures */ /* Allocate and Initialise DI Subdevice Structures */
s = &dev->subdevices[2]; s = &dev->subdevices[2];
if (devpriv->s_EeParameters.i_NbrDiChannel) {
s->type = COMEDI_SUBD_DI; s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON; s->subdev_flags = SDF_READABLE;
s->n_chan = devpriv->s_EeParameters.i_NbrDiChannel; s->n_chan = 32;
s->maxdata = 1; s->maxdata = 1;
s->len_chanlist = s->len_chanlist = 32;
devpriv->s_EeParameters.i_NbrDiChannel;
s->range_table = &range_digital; s->range_table = &range_digital;
s->insn_config = this_board->di_config; s->insn_config = apci1564_di_config;
s->insn_read = this_board->di_read; s->insn_bits = apci1564_di_insn_bits;
s->insn_write = this_board->di_write;
s->insn_bits = this_board->di_bits;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
/* Allocate and Initialise DO Subdevice Structures */ /* Allocate and Initialise DO Subdevice Structures */
s = &dev->subdevices[3]; s = &dev->subdevices[3];
if (devpriv->s_EeParameters.i_NbrDoChannel) { if (devpriv->s_EeParameters.i_NbrDoChannel) {
......
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