Commit 12e1e696 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: usbduxsigma: remove AI scan_begin_src == TRIG_FOLLOW 



The AI subdevice `cmdtest` handler `usbduxsigma_ai_cmdtest()` ensures
that `cmd->scan_begin_src == TRIG_TIMER` by the end of step 2 of the
command checking code, so assume that this is the case for step 3
onwards and remove the redundant code.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarBernd Porr <mail@berndporr.me.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c04a1f17

drivers/staging/comedi/drivers/usbduxsigma.c

+19 −28
Original line number Diff line number Diff line
@@ -482,6 +482,7 @@ static int usbduxsigma_ai_cmdtest(struct comedi_device *dev, 
	struct usbduxsigma_private *devpriv = dev->private;

	int high_speed = devpriv->high_speed;

	int interval = usbduxsigma_chans_to_interval(cmd->chanlist_len);

	unsigned int tmp;

	int err = 0;



	/* Step 1 : check if triggers are trivially valid */
@@ -509,12 +510,6 @@ static int usbduxsigma_ai_cmdtest(struct comedi_device *dev, 


	err |= comedi_check_trigger_arg_is(&cmd->start_arg, 0);



	if (cmd->scan_begin_src == TRIG_FOLLOW)	/* internal trigger */

		err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg, 0);



	if (cmd->scan_begin_src == TRIG_TIMER) {

		unsigned int tmp;



	if (high_speed) {

		/*

		 * In high speed mode microframes are possible.
@@ -522,23 +517,19 @@ static int usbduxsigma_ai_cmdtest(struct comedi_device *dev, 
		 * sample two channels. Thus, the more channels

		 * are in the channel list the more time we need.

		 */

			err |= comedi_check_trigger_arg_min(&cmd->

							    scan_begin_arg,

							    (1000000 / 8 *

							     interval));

		err |= comedi_check_trigger_arg_min(&cmd->scan_begin_arg,

						    (125000 * interval));



		tmp = (cmd->scan_begin_arg / 125000) * 125000;

	} else {

		/* full speed */

		/* 1kHz scans every USB frame */

			err |= comedi_check_trigger_arg_min(&cmd->

							    scan_begin_arg,

		err |= comedi_check_trigger_arg_min(&cmd->scan_begin_arg,

						    1000000);



		tmp = (cmd->scan_begin_arg / 1000000) * 1000000;

	}

	err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg, tmp);

	}



	err |= comedi_check_trigger_arg_is(&cmd->scan_end_arg,

					   cmd->chanlist_len);

CRA Git | Maintained and supported by SUSTech CRA and CCSE