lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: addi_apci_3120: remove 'ui_MinAcquisitiontimeNs'

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten
2012-11-01 17:29:30 -07:00
committed by Greg Kroah-Hartman
parent 1ba296b956
commit 97e998de5d
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View File

@@ -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++;
} }
} }
} }

2
drivers/staging/comedi/drivers/addi_apci_3120.c
View File

@@ -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[] = {
.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,
}, },