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

Use the new helpers in the step 3 tests of ni_pcidio_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_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index 20e7545..5d442b0 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -715,46 +715,32 @@ static int ni_pcidio_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 */
+
+       err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-       if (cmd->start_arg != 0) {
-               /* same for both TRIG_INT and TRIG_NOW */
-               cmd->start_arg = 0;
-               err++;
-       }
 #define MAX_SPEED      (TIMER_BASE)    /* in nanoseconds */
 
        if (cmd->scan_begin_src == TRIG_TIMER) {
-               if (cmd->scan_begin_arg < MAX_SPEED) {
-                       cmd->scan_begin_arg = MAX_SPEED;
-                       err++;
-               }
+               err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                MAX_SPEED);
                /* no minimum speed */
        } else {
                /* TRIG_EXT */
                /* should be level/edge, hi/lo specification here */
                if ((cmd->scan_begin_arg & ~(CR_EDGE | CR_INVERT)) != 0) {
                        cmd->scan_begin_arg &= (CR_EDGE | CR_INVERT);
-                       err++;
+                       err |= -EINVAL;
                }
        }
-       if (cmd->convert_arg != 0) {
-               cmd->convert_arg = 0;
-               err++;
-       }
 
-       if (cmd->scan_end_arg != cmd->chanlist_len) {
-               cmd->scan_end_arg = cmd->chanlist_len;
-               err++;
-       }
+       err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+       err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
        if (cmd->stop_src == TRIG_COUNT) {
                /* no limit */
-       } else {
-               /* TRIG_NONE */
-               if (cmd->stop_arg != 0) {
-                       cmd->stop_arg = 0;
-                       err++;
-               }
+       } else {        /* TRIG_NONE */
+               err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
        }
 
        if (err)