提交 8efdc1bf 编写于 作者: H H Hartley Sweeten 提交者: Greg Kroah-Hartman

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

Use the new helpers in the step 3 tests of ai_cmdtest().
Signed-off-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 b93e56ad
...@@ -1294,45 +1294,23 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -1294,45 +1294,23 @@ static int ai_cmdtest(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->start_arg != 0) { err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
cmd->start_arg = 0; err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
err++;
}
if (cmd->scan_begin_arg != 0) { if (cmd->convert_src == TRIG_TIMER)
cmd->scan_begin_arg = 0; err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
err++; board->ns_min);
} else /* TRIG_EXT */
err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
if (cmd->convert_src == TRIG_TIMER) { err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
if (cmd->convert_arg < board->ns_min) {
cmd->convert_arg = board->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->stop_src == TRIG_COUNT)
cmd->scan_end_arg = cmd->chanlist_len; err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
err++; else /* TRIG_NONE */
} err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
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% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册