openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Use the new helpers in the step 3 tests of ai_cmdtest().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-11-13 17:58:32 -07:00 committed by Greg Kroah-Hartman
parent b93e56ade2
commit 8efdc1bf56
1 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/staging/comedi/drivers/pcl818.c
View File

@ -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;