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

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

Use the new helpers in the step 3 tests of pcl711_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 aadd0132
...@@ -289,38 +289,24 @@ static int pcl711_ai_cmdtest(struct comedi_device *dev, ...@@ -289,38 +289,24 @@ static int pcl711_ai_cmdtest(struct comedi_device *dev,
if (err) if (err)
return 2; return 2;
/* step 3 */ /* Step 3: check if arguments are trivially valid */
err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
if (cmd->start_arg != 0) {
cmd->start_arg = 0;
err++;
}
if (cmd->scan_begin_src == TRIG_EXT) { if (cmd->scan_begin_src == TRIG_EXT) {
if (cmd->scan_begin_arg != 0) { err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
cmd->scan_begin_arg = 0;
err++;
}
} else { } else {
#define MAX_SPEED 1000 #define MAX_SPEED 1000
#define TIMER_BASE 100 #define TIMER_BASE 100
if (cmd->scan_begin_arg < MAX_SPEED) { err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
cmd->scan_begin_arg = MAX_SPEED; MAX_SPEED);
err++;
}
}
if (cmd->convert_arg != 0) {
cmd->convert_arg = 0;
err++;
}
if (cmd->scan_end_arg != cmd->chanlist_len) {
cmd->scan_end_arg = cmd->chanlist_len;
err++;
} }
err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
if (cmd->stop_src == TRIG_NONE) { if (cmd->stop_src == TRIG_NONE) {
if (cmd->stop_arg != 0) { err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
cmd->stop_arg = 0;
err++;
}
} else { } else {
/* ignore */ /* ignore */
} }
......
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