Commit 97e998de authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_apci_3120: remove 'ui_MinAcquisitiontimeNs' 



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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ba296b9

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

+5 −10
Original line number Diff line number Diff line
@@ -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++;



			}

		}

	}

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_MinAcquisitiontimeNs = 10000,

		.ui_MinDelaytimeNs	= 100000,

		.interrupt		= v_APCI3120_Interrupt,

		.ao_write		= i_APCI3120_InsnWriteAnalogOutput,
@@ -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,

	},