staging: comedi: addi_apci_3120: remove 'ui_MinDelaytimeNs'

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@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index ac2e4110f2f84bedc520979a0da6b9731ca51614..094691769bdcd93220b21bf18af706299903e5b4 100644 (file)
--- 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 8e32fbbf35478723b740d815a30c8ba34d5f8935..9ec6bb19954f3db05183ef0c05a90b386f19d3da 100644 (file)
--- 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,
        },
 };