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

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

Use the new helpers in the step 3 tests of pcl816_ai_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 4cd8672a
...@@ -484,43 +484,23 @@ static int pcl816_ai_cmdtest(struct comedi_device *dev, ...@@ -484,43 +484,23 @@ static int pcl816_ai_cmdtest(struct comedi_device *dev,
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_arg != 0) { err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
cmd->scan_begin_arg = 0; err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
err++;
}
if (cmd->convert_src == TRIG_TIMER) {
if (cmd->convert_arg < board->ai_ns_min) {
cmd->convert_arg = board->ai_ns_min;
err++;
}
} else { /* TRIG_EXT */
if (cmd->convert_arg != 0) {
cmd->convert_arg = 0;
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,
err++; board->ai_ns_min);
} else /* TRIG_EXT */
if (cmd->stop_src == TRIG_COUNT) { err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
if (!cmd->stop_arg) {
cmd->stop_arg = 1; err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
err++;
} if (cmd->stop_src == TRIG_COUNT)
} else { /* TRIG_NONE */ err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
if (cmd->stop_arg != 0) { else /* TRIG_NONE */
cmd->stop_arg = 0; err |= cfc_check_trigger_arg_is(&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