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

Use the new helpers in the step 3 tests of ni_tio_cmdtest().

Note that cmd->stop_src only has one trigger source so the extra
test is not required.

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_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c
index 11a377a6c27c94397a99f8f0328132b080360b5c..0c991b99da1349adb2d3987c3e168de66b8d5edd 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_tiocmd.c
+++ b/drivers/staging/comedi/drivers/ni_tiocmd.c
@@ -275,37 +275,19 @@ int ni_tio_cmdtest(struct ni_gpct *counter, struct comedi_cmd *cmd)
        if (err)
                return 2;
 
-       /* step 3: make sure arguments are trivially compatible */
-       if (cmd->start_src != TRIG_EXT) {
-               if (cmd->start_arg != 0) {
-                       cmd->start_arg = 0;
-                       err++;
-               }
-       }
-       if (cmd->scan_begin_src != TRIG_EXT) {
-               if (cmd->scan_begin_arg) {
-                       cmd->scan_begin_arg = 0;
-                       err++;
-               }
-       }
-       if (cmd->convert_src != TRIG_EXT) {
-               if (cmd->convert_arg) {
-                       cmd->convert_arg = 0;
-                       err++;
-               }
-       }
+       /* Step 3: check if arguments are trivially valid */
 
-       if (cmd->scan_end_arg != cmd->chanlist_len) {
-               cmd->scan_end_arg = cmd->chanlist_len;
-               err++;
-       }
+       if (cmd->start_src != TRIG_EXT)
+               err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-       if (cmd->stop_src == TRIG_NONE) {
-               if (cmd->stop_arg != 0) {
-                       cmd->stop_arg = 0;
-                       err++;
-               }
-       }
+       if (cmd->scan_begin_src != TRIG_EXT)
+               err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+
+       if (cmd->convert_src != TRIG_EXT)
+               err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+
+       err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+       err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
        if (err)
                return 3;