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

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

Use the new helpers in the step 3 tests of di_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 39c7bba8
...@@ -641,29 +641,20 @@ static int di_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -641,29 +641,20 @@ static int di_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
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->chanlist_len) { if (!cmd->chanlist_len) {
cmd->chanlist_len = 32; cmd->chanlist_len = 32;
err++; err |= -EINVAL;
}
if (cmd->scan_end_arg != cmd->chanlist_len) {
cmd->scan_end_arg = cmd->chanlist_len;
err++;
} }
err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
switch (cmd->stop_src) { switch (cmd->stop_src) {
case TRIG_COUNT: case TRIG_COUNT:
if (!cmd->stop_arg) { err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
cmd->stop_arg = 1;
err++;
}
break; break;
case TRIG_NONE: case TRIG_NONE:
if (cmd->stop_arg != 0) { err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
cmd->stop_arg = 0;
err++;
}
break; break;
default: default:
break; break;
......
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