Commit 97e998de authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: addi_apci_3120: remove 'ui_MinAcquisitiontimeNs'

Both boards supported by this driver have the same minimum acquisition
time.. Remove the boardinfo for it and just open code the value in
i_APCI3120_CommandTestAnalogInput().
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 1ba296b9
...@@ -787,20 +787,15 @@ static int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev, ...@@ -787,20 +787,15 @@ static int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev,
if (cmd->convert_src == TRIG_TIMER) { /* Test Acquisition timing */ if (cmd->convert_src == TRIG_TIMER) { /* Test Acquisition timing */
if (cmd->scan_begin_src == TRIG_TIMER) { if (cmd->scan_begin_src == TRIG_TIMER) {
if ((cmd->convert_arg) if (cmd->convert_arg &&
&& (cmd->convert_arg < (cmd->convert_arg < 10000)) {
this_board->ui_MinAcquisitiontimeNs)) { cmd->convert_arg = 10000;
cmd->convert_arg =
this_board->ui_MinAcquisitiontimeNs;
err++; err++;
} }
} else { } else {
if (cmd->convert_arg < if (cmd->convert_arg < 10000) {
this_board->ui_MinAcquisitiontimeNs) { cmd->convert_arg = 10000;
cmd->convert_arg =
this_board->ui_MinAcquisitiontimeNs;
err++; err++;
} }
} }
} }
......
...@@ -26,7 +26,6 @@ static const struct addi_board apci3120_boardtypes[] = { ...@@ -26,7 +26,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrDoChannel = 4, .i_NbrDoChannel = 4,
.i_DoMaxdata = 0x0f, .i_DoMaxdata = 0x0f,
.b_AvailableConvertUnit = 1, .b_AvailableConvertUnit = 1,
.ui_MinAcquisitiontimeNs = 10000,
.ui_MinDelaytimeNs = 100000, .ui_MinDelaytimeNs = 100000,
.interrupt = v_APCI3120_Interrupt, .interrupt = v_APCI3120_Interrupt,
.ao_write = i_APCI3120_InsnWriteAnalogOutput, .ao_write = i_APCI3120_InsnWriteAnalogOutput,
...@@ -42,7 +41,6 @@ static const struct addi_board apci3120_boardtypes[] = { ...@@ -42,7 +41,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrDoChannel = 4, .i_NbrDoChannel = 4,
.i_DoMaxdata = 0x0f, .i_DoMaxdata = 0x0f,
.b_AvailableConvertUnit = 1, .b_AvailableConvertUnit = 1,
.ui_MinAcquisitiontimeNs = 10000,
.ui_MinDelaytimeNs = 100000, .ui_MinDelaytimeNs = 100000,
.interrupt = v_APCI3120_Interrupt, .interrupt = v_APCI3120_Interrupt,
}, },
......
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