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

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

Use the new helpers in the step 3 tests of dmm32at_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:54:56 -07:00 committed by Greg Kroah-Hartman
parent 35402007dd
commit e43ed5fa14
1 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/staging/comedi/drivers/dmm32at.c
View File

@ -280,33 +280,25 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev,
if (err)
return 2;
/* step 3: make sure arguments are trivially compatible */
/* 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++;
}
#define MAX_SCAN_SPEED 1000000 /* in nanoseconds */
#define MIN_SCAN_SPEED 1000000000 /* in nanoseconds */
if (cmd->scan_begin_src == TRIG_TIMER) {
if (cmd->scan_begin_arg < MAX_SCAN_SPEED) {
cmd->scan_begin_arg = MAX_SCAN_SPEED;
err++;
}
if (cmd->scan_begin_arg > MIN_SCAN_SPEED) {
cmd->scan_begin_arg = MIN_SCAN_SPEED;
err++;
}
err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
MAX_SCAN_SPEED);
err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
MIN_SCAN_SPEED);
} else {
/* external trigger */
/* should be level/edge, hi/lo specification here */
/* should specify multiple external triggers */
if (cmd->scan_begin_arg > 9) {
cmd->scan_begin_arg = 9;
err++;
}
err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 9);
}
if (cmd->convert_src == TRIG_TIMER) {
if (cmd->convert_arg >= 17500)
cmd->convert_arg = 20000;
@ -316,35 +308,20 @@ static int dmm32at_ai_cmdtest(struct comedi_device *dev,
cmd->convert_arg = 10000;
else
cmd->convert_arg = 5000;
} else {
/* external trigger */
/* see above */
if (cmd->convert_arg > 9) {
cmd->convert_arg = 9;
err++;
}
err |= cfc_check_trigger_arg_max(&cmd->convert_arg, 9);
}
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);
if (cmd->stop_src == TRIG_COUNT) {
if (cmd->stop_arg > 0xfffffff0) {
cmd->stop_arg = 0xfffffff0;
err++;
}
if (cmd->stop_arg == 0) {
cmd->stop_arg = 1;
err++;
}
err |= cfc_check_trigger_arg_max(&cmd->stop_arg, 0xfffffff0);
err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
} else {
/* TRIG_NONE */
if (cmd->stop_arg != 0) {
cmd->stop_arg = 0;
err++;
}
err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
}
if (err)