Commit 3d6a4d11 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: rtd520: 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.

Use cfc_check_trigger_arg_min() to vaidate the scan_begin_arg when the
scan_begin_src and convert_src are both 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 6c71941d
...@@ -779,7 +779,7 @@ static int rtd_ai_cmdtest(struct comedi_device *dev, ...@@ -779,7 +779,7 @@ static int rtd_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd) struct comedi_subdevice *s, struct comedi_cmd *cmd)
{ {
int err = 0; int err = 0;
int tmp; unsigned int arg;
/* Step 1 : check if triggers are trivially valid */ /* Step 1 : check if triggers are trivially valid */
...@@ -894,26 +894,20 @@ static int rtd_ai_cmdtest(struct comedi_device *dev, ...@@ -894,26 +894,20 @@ static int rtd_ai_cmdtest(struct comedi_device *dev,
/* step 4: fix up any arguments */ /* step 4: fix up any arguments */
if (cmd->scan_begin_src == TRIG_TIMER) { if (cmd->scan_begin_src == TRIG_TIMER) {
tmp = cmd->scan_begin_arg; arg = cmd->scan_begin_arg;
rtd_ns_to_timer(&cmd->scan_begin_arg, rtd_ns_to_timer(&arg, cmd->flags & TRIG_ROUND_MASK);
cmd->flags & TRIG_ROUND_MASK); err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, arg);
if (tmp != cmd->scan_begin_arg)
err++;
} }
if (cmd->convert_src == TRIG_TIMER) { if (cmd->convert_src == TRIG_TIMER) {
tmp = cmd->convert_arg; arg = cmd->convert_arg;
rtd_ns_to_timer(&cmd->convert_arg, rtd_ns_to_timer(&arg, cmd->flags & TRIG_ROUND_MASK);
cmd->flags & TRIG_ROUND_MASK); err |= cfc_check_trigger_arg_is(&cmd->convert_arg, arg);
if (tmp != cmd->convert_arg)
err++; if (cmd->scan_begin_src == TRIG_TIMER) {
arg = cmd->convert_arg * cmd->scan_end_arg;
if (cmd->scan_begin_src == TRIG_TIMER err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
&& (cmd->scan_begin_arg arg);
< (cmd->convert_arg * cmd->scan_end_arg))) {
cmd->scan_begin_arg =
cmd->convert_arg * cmd->scan_end_arg;
err++;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment