Commit 050b3b18 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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

Use the new helpers in the step 3 tests of das16m1_cmd_test().
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 a48e1258
...@@ -186,40 +186,23 @@ static int das16m1_cmd_test(struct comedi_device *dev, ...@@ -186,40 +186,23 @@ static int das16m1_cmd_test(struct comedi_device *dev,
if (err) if (err)
return 2; return 2;
/* step 3: make sure arguments are trivially compatible */ /* Step 3: check if arguments are trivially valid */
if (cmd->start_arg != 0) {
cmd->start_arg = 0;
err++;
}
if (cmd->scan_begin_src == TRIG_FOLLOW) { err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
/* internal trigger */
if (cmd->scan_begin_arg != 0) {
cmd->scan_begin_arg = 0;
err++;
}
}
if (cmd->convert_src == TRIG_TIMER) { if (cmd->scan_begin_src == TRIG_FOLLOW) /* internal trigger */
if (cmd->convert_arg < 1000) { err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
cmd->convert_arg = 1000;
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, 1000);
err++;
} err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
if (cmd->stop_src == TRIG_COUNT) { if (cmd->stop_src == TRIG_COUNT) {
/* any count is allowed */ /* any count is allowed */
} else { } else {
/* TRIG_NONE */ /* TRIG_NONE */
if (cmd->stop_arg != 0) { err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
cmd->stop_arg = 0;
err++;
}
} }
if (err) if (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