diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-11-13 17:50:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-14 16:23:03 -0800 |
| commit | 5f93c88fe74d554b63d30707043ee16d8f65eef3 (patch) | |
| tree | df0106fdd395d66fbb1eb4ff9c4818b50b6294b1 | |
| parent | effa7a282e2bce17cdabc631de4c9905dc570498 (diff) | |
| download | talos-op-linux-5f93c88fe74d554b63d30707043ee16d8f65eef3.tar.gz talos-op-linux-5f93c88fe74d554b63d30707043ee16d8f65eef3.zip | |
staging: comedi: ni_65xx: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of ni_65xx_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>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_65xx.c | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c index df7a3df83ba3..8318081c89be 100644 --- a/drivers/staging/comedi/drivers/ni_65xx.c +++ b/drivers/staging/comedi/drivers/ni_65xx.c @@ -504,29 +504,13 @@ static int ni_65xx_intr_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 */ - if (cmd->start_arg != 0) { - cmd->start_arg = 0; - err++; - } - if (cmd->scan_begin_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++; - } + err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0); + err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0); + err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0); + err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, 1); + err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0); if (err) return 3; |
