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

staging: comedi: dt282x: 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 704b0050

drivers/staging/comedi/drivers/dt282x.c

+8 −10
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ static int dt282x_ai_cmdtest(struct comedi_device *dev, 
{

	const struct dt282x_board *board = comedi_board(dev);

	int err = 0;

	int tmp;

	unsigned int arg;



	/* Step 1 : check if triggers are trivially valid */
@@ -633,10 +633,9 @@ static int dt282x_ai_cmdtest(struct comedi_device *dev, 


	/* step 4: fix up any arguments */



	tmp = cmd->convert_arg;

	dt282x_ns_to_timer(&cmd->convert_arg, cmd->flags & TRIG_ROUND_MASK);

	if (tmp != cmd->convert_arg)

		err++;

	arg = cmd->convert_arg;

	dt282x_ns_to_timer(&arg, cmd->flags & TRIG_ROUND_MASK);

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



	if (err)

		return 4;
@@ -825,7 +824,7 @@ static int dt282x_ao_cmdtest(struct comedi_device *dev, 
			     struct comedi_subdevice *s, struct comedi_cmd *cmd)

{

	int err = 0;

	int tmp;

	unsigned int arg;



	/* Step 1 : check if triggers are trivially valid */
@@ -865,10 +864,9 @@ static int dt282x_ao_cmdtest(struct comedi_device *dev, 


	/* step 4: fix up any arguments */



	tmp = cmd->scan_begin_arg;

	dt282x_ns_to_timer(&cmd->scan_begin_arg, cmd->flags & TRIG_ROUND_MASK);

	if (tmp != cmd->scan_begin_arg)

		err++;

	arg = cmd->scan_begin_arg;

	dt282x_ns_to_timer(&arg, cmd->flags & TRIG_ROUND_MASK);

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



	if (err)

		return 4;

CRA Git | Maintained and supported by SUSTech CRA and CCSE