Commit 53b168b9 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: addi_apci_3120: remove test for timer support

The boards supported by this driver support a timer subdevice.
Remove the tests for it.
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 4fbe36f2
...@@ -29,7 +29,6 @@ static const struct addi_board apci3120_boardtypes[] = { ...@@ -29,7 +29,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrDiChannel = 4, .i_NbrDiChannel = 4,
.i_NbrDoChannel = 4, .i_NbrDoChannel = 4,
.i_DoMaxdata = 0x0f, .i_DoMaxdata = 0x0f,
.i_Timer = 1,
.b_AvailableConvertUnit = 1, .b_AvailableConvertUnit = 1,
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
.ui_MinDelaytimeNs = 100000, .ui_MinDelaytimeNs = 100000,
...@@ -64,7 +63,6 @@ static const struct addi_board apci3120_boardtypes[] = { ...@@ -64,7 +63,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrDiChannel = 4, .i_NbrDiChannel = 4,
.i_NbrDoChannel = 4, .i_NbrDoChannel = 4,
.i_DoMaxdata = 0x0f, .i_DoMaxdata = 0x0f,
.i_Timer = 1,
.b_AvailableConvertUnit = 1, .b_AvailableConvertUnit = 1,
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
.ui_MinDelaytimeNs = 100000, .ui_MinDelaytimeNs = 100000,
...@@ -282,21 +280,17 @@ static int apci3120_attach_pci(struct comedi_device *dev, ...@@ -282,21 +280,17 @@ static int apci3120_attach_pci(struct comedi_device *dev,
/* Allocate and Initialise Timer Subdevice Structures */ /* Allocate and Initialise Timer Subdevice Structures */
s = &dev->subdevices[4]; s = &dev->subdevices[4];
if (this_board->i_Timer) { s->type = COMEDI_SUBD_TIMER;
s->type = COMEDI_SUBD_TIMER; s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON; s->n_chan = 1;
s->n_chan = 1; s->maxdata = 0;
s->maxdata = 0; s->len_chanlist = 1;
s->len_chanlist = 1; s->range_table = &range_digital;
s->range_table = &range_digital;
s->insn_write = this_board->timer_write;
s->insn_write = this_board->timer_write; s->insn_read = this_board->timer_read;
s->insn_read = this_board->timer_read; s->insn_config = this_board->timer_config;
s->insn_config = this_board->timer_config; s->insn_bits = this_board->timer_bits;
s->insn_bits = this_board->timer_bits;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
/* Allocate and Initialise TTL */ /* Allocate and Initialise TTL */
s = &dev->subdevices[5]; s = &dev->subdevices[5];
......
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