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

Use the new helpers in the step 3 tests of ni6527_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>

diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index 112742ebad9a159db73308b4f4e98d5d192a91d8..24102d1aa82e10e29989e8d749cad36a6d0f169d 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -247,29 +247,13 @@ static int ni6527_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;