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

Use the new helpers in the step 3 tests of daqp_ai_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/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index ee9158b203c9972699d0a2f0621db0a41c43ea91..ef0cdaa7f02e4b75e2aa7886a70190a0c392de1b 100644 (file)
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -482,19 +482,15 @@ static int daqp_ai_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) {
-               cmd->start_arg = 0;
-               err++;
-       }
 #define MAX_SPEED      10000   /* 100 kHz - in nanoseconds */
 
-       if (cmd->scan_begin_src == TRIG_TIMER
-           && cmd->scan_begin_arg < MAX_SPEED) {
-               cmd->scan_begin_arg = MAX_SPEED;
-               err++;
-       }
+       if (cmd->scan_begin_src == TRIG_TIMER)
+               err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                MAX_SPEED);
 
        /* If both scan_begin and convert are both timer values, the only
         * way that can make sense is if the scan time is the number of
@@ -503,30 +499,18 @@ static int daqp_ai_cmdtest(struct comedi_device *dev,
 
        if (cmd->scan_begin_src == TRIG_TIMER && cmd->convert_src == TRIG_TIMER
            && cmd->scan_begin_arg != cmd->convert_arg * cmd->scan_end_arg) {
-               err++;
+               err |= -EINVAL;
        }
 
-       if (cmd->convert_src == TRIG_TIMER && cmd->convert_arg < MAX_SPEED) {
-               cmd->convert_arg = MAX_SPEED;
-               err++;
-       }
+       if (cmd->convert_src == TRIG_TIMER)
+               err |= cfc_check_trigger_arg_min(&cmd->convert_arg, MAX_SPEED);
 
-       if (cmd->scan_end_arg != cmd->chanlist_len) {
-               cmd->scan_end_arg = cmd->chanlist_len;
-               err++;
-       }
-       if (cmd->stop_src == TRIG_COUNT) {
-               if (cmd->stop_arg > 0x00ffffff) {
-                       cmd->stop_arg = 0x00ffffff;
-                       err++;
-               }
-       } else {
-               /* TRIG_NONE */
-               if (cmd->stop_arg != 0) {
-                       cmd->stop_arg = 0;
-                       err++;
-               }
-       }
+       err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+       if (cmd->stop_src == TRIG_COUNT)
+               err |= cfc_check_trigger_arg_max(&cmd->stop_arg, 0x00ffffff);
+       else    /* TRIG_NONE */
+               err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
        if (err)
                return 3;