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

staging: comedi: cb_pcidas: use comedi_fc helpers to validate timer args 



Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger arguments when the source is TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9c1efda8

drivers/staging/comedi/drivers/cb_pcidas.c

+11 −14
Original line number Diff line number Diff line
@@ -837,7 +837,7 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device *dev, 
	const struct cb_pcidas_board *thisboard = comedi_board(dev);

	struct cb_pcidas_private *devpriv = dev->private;

	int err = 0;

	int tmp;

	unsigned int arg;



	/* Step 1 : check if triggers are trivially valid */
@@ -912,22 +912,20 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device *dev, 
	/* step 4: fix up any arguments */



	if (cmd->scan_begin_src == TRIG_TIMER) {

		tmp = cmd->scan_begin_arg;

		arg = cmd->scan_begin_arg;

		i8253_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,

					  &devpriv->divisor1,

					  &devpriv->divisor2,

					  &cmd->scan_begin_arg, cmd->flags);

		if (tmp != cmd->scan_begin_arg)

			err++;

					  &arg, cmd->flags);

		err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, arg);

	}

	if (cmd->convert_src == TRIG_TIMER) {

		tmp = cmd->convert_arg;

		arg = cmd->convert_arg;

		i8253_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,

					  &devpriv->divisor1,

					  &devpriv->divisor2,

					  &cmd->convert_arg, cmd->flags);

		if (tmp != cmd->convert_arg)

			err++;

					  &arg, cmd->flags);

		err |= cfc_check_trigger_arg_is(&cmd->convert_arg, arg);

	}



	if (err)
@@ -1064,7 +1062,7 @@ static int cb_pcidas_ao_cmdtest(struct comedi_device *dev, 
	const struct cb_pcidas_board *thisboard = comedi_board(dev);

	struct cb_pcidas_private *devpriv = dev->private;

	int err = 0;

	int tmp;

	unsigned int arg;



	/* Step 1 : check if triggers are trivially valid */
@@ -1107,13 +1105,12 @@ static int cb_pcidas_ao_cmdtest(struct comedi_device *dev, 
	/* step 4: fix up any arguments */



	if (cmd->scan_begin_src == TRIG_TIMER) {

		tmp = cmd->scan_begin_arg;

		arg = cmd->scan_begin_arg;

		i8253_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,

					  &devpriv->ao_divisor1,

					  &devpriv->ao_divisor2,

					  &cmd->scan_begin_arg, cmd->flags);

		if (tmp != cmd->scan_begin_arg)

			err++;

					  &arg, cmd->flags);

		err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, arg);

	}



	if (err)

CRA Git | Maintained and supported by SUSTech CRA and CCSE