Commit 50b825ff authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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

Use the new helpers in the step 3 tests of das800_ai_do_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 c563065b
...@@ -622,37 +622,21 @@ static int das800_ai_do_cmdtest(struct comedi_device *dev, ...@@ -622,37 +622,21 @@ static int das800_ai_do_cmdtest(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) { err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
cmd->start_arg = 0;
err++; if (cmd->convert_src == TRIG_TIMER)
} err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
if (cmd->convert_src == TRIG_TIMER) { thisboard->ai_speed);
if (cmd->convert_arg < thisboard->ai_speed) {
cmd->convert_arg = thisboard->ai_speed; err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);
err++; err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
}
} if (cmd->stop_src == TRIG_COUNT)
if (!cmd->chanlist_len) { err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
cmd->chanlist_len = 1; else /* TRIG_NONE */
err++; err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
}
if (cmd->scan_end_arg != cmd->chanlist_len) {
cmd->scan_end_arg = cmd->chanlist_len;
err++;
}
if (cmd->stop_src == TRIG_COUNT) {
if (!cmd->stop_arg) {
cmd->stop_arg = 1;
err++;
}
} else { /* TRIG_NONE */
if (cmd->stop_arg != 0) {
cmd->stop_arg = 0;
err++;
}
}
if (err) if (err)
return 3; return 3;
......
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