Skip to content

Commit

Permalink
staging: comedi: addi_apci_3120: remove 'ui_MinAcquisitiontimeNs'
Browse files Browse the repository at this point in the history
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: 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 Nov 2, 2012
1 parent 1ba296b commit 97e998d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
15 changes: 5 additions & 10 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
Original file line number Diff line number Diff line change
Expand Up @@ -787,20 +787,15 @@ static int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev,

if (cmd->convert_src == TRIG_TIMER) { /* Test Acquisition timing */
if (cmd->scan_begin_src == TRIG_TIMER) {
if ((cmd->convert_arg)
&& (cmd->convert_arg <
this_board->ui_MinAcquisitiontimeNs)) {
cmd->convert_arg =
this_board->ui_MinAcquisitiontimeNs;
if (cmd->convert_arg &&
(cmd->convert_arg < 10000)) {
cmd->convert_arg = 10000;
err++;
}
} else {
if (cmd->convert_arg <
this_board->ui_MinAcquisitiontimeNs) {
cmd->convert_arg =
this_board->ui_MinAcquisitiontimeNs;
if (cmd->convert_arg < 10000) {
cmd->convert_arg = 10000;
err++;

}
}
}
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/comedi/drivers/addi_apci_3120.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrDoChannel = 4,
.i_DoMaxdata = 0x0f,
.b_AvailableConvertUnit = 1,
.ui_MinAcquisitiontimeNs = 10000,
.ui_MinDelaytimeNs = 100000,
.interrupt = v_APCI3120_Interrupt,
.ao_write = i_APCI3120_InsnWriteAnalogOutput,
Expand All @@ -42,7 +41,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrDoChannel = 4,
.i_DoMaxdata = 0x0f,
.b_AvailableConvertUnit = 1,
.ui_MinAcquisitiontimeNs = 10000,
.ui_MinDelaytimeNs = 100000,
.interrupt = v_APCI3120_Interrupt,
},
Expand Down

0 comments on commit 97e998d

Please sign in to comment.