leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Use the new helpers in the step 3 tests of parport_intr_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:48:41 -07:00 committed by Greg Kroah-Hartman
parent 851eef809c
commit 2404271050
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/staging/comedi/drivers/comedi_parport.c
View File

@ -196,28 +196,13 @@ static int parport_intr_cmdtest(struct comedi_device *dev,
if (err) if (err)
return 2; return 2;
/* step 3: */ /* 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++; err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
} err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, 1);
if (cmd->scan_begin_arg != 0) { err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
cmd->scan_begin_arg = 0;
err++;
}
if (cmd->convert_arg != 0) {
cmd->convert_arg = 0;
err++;
}
if (cmd->scan_end_arg != 1) {
cmd->scan_end_arg = 1;
err++;
}
if (cmd->stop_arg != 0) {
cmd->stop_arg = 0;
err++;
}
if (err) if (err)
return 3; return 3;