diff options
| author |   H Hartley Sweeten <hartleys@visionengravers.com> | 2012-11-13 17:48:23 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-14 16:23:02 -0800 |
| commit | 851eef809c50d79e13e44fbd2b35b58fab0d4932 (patch) | |
| tree | 4f12a0ee25a0513f9fb1df6b31f635481f82636e /drivers/staging/comedi/drivers/8255.c | |
| parent | staging: comedi: comedi_fc.h: introduce new helpers for do_cmdtest step 3 (diff) | |
| download | linux-dev-851eef809c50d79e13e44fbd2b35b58fab0d4932.tar.xz linux-dev-851eef809c50d79e13e44fbd2b35b58fab0d4932.zip | |
staging: comedi: 8255: use cfc_check_trigger_arg_*() helpers
Use the new helpers in the step 3 tests of subdev_8255_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>
Diffstat (limited to 'drivers/staging/comedi/drivers/8255.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/8255.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c index a256622e2dd7..c7aa41ad842f 100644 --- a/drivers/staging/comedi/drivers/8255.c +++ b/drivers/staging/comedi/drivers/8255.c @@ -249,28 +249,13 @@ static int subdev_8255_cmdtest(struct comedi_device *dev, if (err) return 2; - /* step 3 */ + /* 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; |