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

staging: comedi: cb_pcidas: use cfc_check_trigger_arg_*() helpers 



Use the new helpers in the step 3 tests of cb_pcidas_{ai,ao}_cmdtest().

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 7d4adbe4

drivers/staging/comedi/drivers/cb_pcidas.c

+25 −55
Original line number Original line Diff line number Diff line
@@ -840,49 +840,32 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device *dev, 
		/* External trigger, only CR_EDGE and CR_INVERT flags allowed */

		/* External trigger, only CR_EDGE and CR_INVERT flags allowed */

		if ((cmd->start_arg

		if ((cmd->start_arg

		     & (CR_FLAGS_MASK & ~(CR_EDGE | CR_INVERT))) != 0) {

		     & (CR_FLAGS_MASK & ~(CR_EDGE | CR_INVERT))) != 0) {

			cmd->start_arg &=

			cmd->start_arg &= ~(CR_FLAGS_MASK &

			    ~(CR_FLAGS_MASK & ~(CR_EDGE | CR_INVERT));

						~(CR_EDGE | CR_INVERT));

			err++;

			err |= -EINVAL;

		}

		}

		if (!thisboard->is_1602 && (cmd->start_arg & CR_INVERT)) {

		if (!thisboard->is_1602 && (cmd->start_arg & CR_INVERT)) {

			cmd->start_arg &= (CR_FLAGS_MASK & ~CR_INVERT);

			cmd->start_arg &= (CR_FLAGS_MASK & ~CR_INVERT);

			err++;

			err |= -EINVAL;

		}

		}

		break;

		break;

	default:

	default:

		if (cmd->start_arg != 0) {

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

			cmd->start_arg = 0;

			err++;

		}

		break;

		break;

	}

	}





	if (cmd->scan_begin_src == TRIG_TIMER) {

	if (cmd->scan_begin_src == TRIG_TIMER)

		if (cmd->scan_begin_arg <

		err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,

		    thisboard->ai_speed * cmd->chanlist_len) {

				thisboard->ai_speed * cmd->chanlist_len);

			cmd->scan_begin_arg =

			    thisboard->ai_speed * cmd->chanlist_len;

			err++;

		}

	}

	if (cmd->convert_src == TRIG_TIMER) {

		if (cmd->convert_arg < thisboard->ai_speed) {

			cmd->convert_arg = thisboard->ai_speed;

			err++;

		}

	}





	if (cmd->scan_end_arg != cmd->chanlist_len) {

	if (cmd->convert_src == TRIG_TIMER)

		cmd->scan_end_arg = cmd->chanlist_len;

		err |= cfc_check_trigger_arg_min(&cmd->convert_arg,

		err++;

						 thisboard->ai_speed);

	}



	if (cmd->stop_src == TRIG_NONE) {

	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);

		/* TRIG_NONE */



		if (cmd->stop_arg != 0) {

	if (cmd->stop_src == TRIG_NONE)

			cmd->stop_arg = 0;

		err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);

			err++;

		}

	}





	if (err)

	if (err)

		return 3;

		return 3;
@@ -1075,31 +1058,18 @@ static int cb_pcidas_ao_cmdtest(struct comedi_device *dev, 
	if (err)

	if (err)

		return 2;

		return 2;





	/* step 3: arguments are trivially compatible */

	/* Step 3: check if arguments are trivially valid */





	if (cmd->start_arg != 0) {

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

		cmd->start_arg = 0;

		err++;

	}





	if (cmd->scan_begin_src == TRIG_TIMER) {

	if (cmd->scan_begin_src == TRIG_TIMER)

		if (cmd->scan_begin_arg < thisboard->ao_scan_speed) {

		err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,

			cmd->scan_begin_arg = thisboard->ao_scan_speed;

						 thisboard->ao_scan_speed);

			err++;

		}

	}





	if (cmd->scan_end_arg != cmd->chanlist_len) {

	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);

		cmd->scan_end_arg = cmd->chanlist_len;



		err++;

	if (cmd->stop_src == TRIG_NONE)

	}

		err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);

	if (cmd->stop_src == TRIG_NONE) {

		/* TRIG_NONE */

		if (cmd->stop_arg != 0) {

			cmd->stop_arg = 0;

			err++;

		}

	}





	if (err)

	if (err)

		return 3;

		return 3;