Both boards supported by this driver have the same minimum delay time.
Remove the boardinfo for it and just open code the value in
i_APCI3120_CommandTestAnalogInput().
Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 6 ++----
drivers/staging/comedi/drivers/addi_apci_3120.c | 2 --
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index ac2e411..0946917 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -777,10 +777,8 @@ static int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev,
}
if (cmd->scan_begin_src == TRIG_TIMER) { /* Test Delay timing */
- if (cmd->scan_begin_arg <
- this_board->ui_MinDelaytimeNs) {
- cmd->scan_begin_arg =
- this_board->ui_MinDelaytimeNs;
+ if (cmd->scan_begin_arg < 100000) {
+ cmd->scan_begin_arg = 100000;
err++;
}
}
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 8e32fbb..9ec6bb1 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -26,7 +26,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrDoChannel = 4,
.i_DoMaxdata = 0x0f,
.b_AvailableConvertUnit = 1,
- .ui_MinDelaytimeNs = 100000,
.interrupt = v_APCI3120_Interrupt,
.ao_write = i_APCI3120_InsnWriteAnalogOutput,
}, {
@@ -41,7 +40,6 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrDoChannel = 4,
.i_DoMaxdata = 0x0f,
.b_AvailableConvertUnit = 1,
- .ui_MinDelaytimeNs = 100000,
.interrupt = v_APCI3120_Interrupt,
},
};
--
1.7.11
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
