Commit dfb8a4ab authored Nov 01, 2012 by H Hartley Sweeten Committed by Greg Kroah-Hartman Nov 02, 2012

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>

parent 97e998de

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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++;
		}
		}

drivers/staging/comedi/drivers/addi_apci_3120.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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,
		},
		};