Skip to content

Commit

Permalink
staging: comedi: addi_apci_1564: board has 32 digital outputs
Browse files Browse the repository at this point in the history
This board always has 32 digital outputs.  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 outputs and just use the data directly in
the subdevice init.

Signed-off-by: Chase Southwood <chase.southwood@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Chase Southwood authored and Greg Kroah-Hartman committed May 23, 2014
1 parent c819338 commit 33ae8a5
Showing 1 changed file with 9 additions and 20 deletions.
29 changes: 9 additions & 20 deletions drivers/staging/comedi/drivers/addi_apci_1564.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ static const struct addi_board apci1564_boardtypes[] = {
.i_Timer = 1,
.interrupt = apci1564_interrupt,
.reset = apci1564_reset,
.do_config = apci1564_do_config,
.do_bits = apci1564_do_insn_bits,
.do_read = apci1564_do_read,
.timer_config = apci1564_timer_config,
.timer_write = apci1564_timer_write,
.timer_read = apci1564_timer_read,
Expand Down Expand Up @@ -98,23 +95,15 @@ static int apci1564_auto_attach(struct comedi_device *dev,

/* Allocate and Initialise DO Subdevice Structures */
s = &dev->subdevices[3];
if (this_board->i_NbrDoChannel) {
s->type = COMEDI_SUBD_DO;
s->subdev_flags =
SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = this_board->i_NbrDoChannel;
s->maxdata = this_board->i_DoMaxdata;
s->len_chanlist = this_board->i_NbrDoChannel;
s->range_table = &range_digital;

/* insn_config - for digital output memory */
s->insn_config = this_board->do_config;
s->insn_write = this_board->do_write;
s->insn_bits = this_board->do_bits;
s->insn_read = this_board->do_read;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
s->type = COMEDI_SUBD_DO;
s->subdev_flags = SDF_WRITEABLE;
s->n_chan = 32;
s->maxdata = 0xffffffff;
s->len_chanlist = 32;
s->range_table = &range_digital;
s->insn_config = apci1564_do_config;
s->insn_bits = apci1564_do_insn_bits;
s->insn_read = apci1564_do_read;

/* Allocate and Initialise Timer Subdevice Structures */
s = &dev->subdevices[4];
Expand Down

0 comments on commit 33ae8a5

Please sign in to comment.