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

Use the new helpers in the step 3 tests of cb_pcidas_{ai,ao}_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/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index e7314e5f7264639c49c1b323a5446780d5fedbfd..9c45e85ec3046657d04bf55686e1ddf6b75024c1 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -840,49 +840,32 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device *dev,
                /* External trigger, only CR_EDGE and CR_INVERT flags allowed */
                if ((cmd->start_arg
                     & (CR_FLAGS_MASK & ~(CR_EDGE | CR_INVERT))) != 0) {
-                       cmd->start_arg &=
-                           ~(CR_FLAGS_MASK & ~(CR_EDGE | CR_INVERT));
-                       err++;
+                       cmd->start_arg &= ~(CR_FLAGS_MASK &
+                                               ~(CR_EDGE | CR_INVERT));
+                       err |= -EINVAL;
                }
                if (!thisboard->is_1602 && (cmd->start_arg & CR_INVERT)) {
                        cmd->start_arg &= (CR_FLAGS_MASK & ~CR_INVERT);
-                       err++;
+                       err |= -EINVAL;
                }
                break;
        default:
-               if (cmd->start_arg != 0) {
-                       cmd->start_arg = 0;
-                       err++;
-               }
+               err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
                break;
        }
 
-       if (cmd->scan_begin_src == TRIG_TIMER) {
-               if (cmd->scan_begin_arg <
-                   thisboard->ai_speed * cmd->chanlist_len) {
-                       cmd->scan_begin_arg =
-                           thisboard->ai_speed * cmd->chanlist_len;
-                       err++;
-               }
-       }
-       if (cmd->convert_src == TRIG_TIMER) {
-               if (cmd->convert_arg < thisboard->ai_speed) {
-                       cmd->convert_arg = thisboard->ai_speed;
-                       err++;
-               }
-       }
+       if (cmd->scan_begin_src == TRIG_TIMER)
+               err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                               thisboard->ai_speed * cmd->chanlist_len);
 
-       if (cmd->scan_end_arg != cmd->chanlist_len) {
-               cmd->scan_end_arg = cmd->chanlist_len;
-               err++;
-       }
-       if (cmd->stop_src == TRIG_NONE) {
-               /* TRIG_NONE */
-               if (cmd->stop_arg != 0) {
-                       cmd->stop_arg = 0;
-                       err++;
-               }
-       }
+       if (cmd->convert_src == TRIG_TIMER)
+               err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
+                                                thisboard->ai_speed);
+
+       err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+
+       if (cmd->stop_src == TRIG_NONE)
+               err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
        if (err)
                return 3;
@@ -1075,31 +1058,18 @@ static int cb_pcidas_ao_cmdtest(struct comedi_device *dev,
        if (err)
                return 2;
 
-       /* step 3: arguments are trivially compatible */
+       /* Step 3: check if arguments are trivially valid */
 
-       if (cmd->start_arg != 0) {
-               cmd->start_arg = 0;
-               err++;
-       }
+       err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
 
-       if (cmd->scan_begin_src == TRIG_TIMER) {
-               if (cmd->scan_begin_arg < thisboard->ao_scan_speed) {
-                       cmd->scan_begin_arg = thisboard->ao_scan_speed;
-                       err++;
-               }
-       }
+       if (cmd->scan_begin_src == TRIG_TIMER)
+               err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                thisboard->ao_scan_speed);
 
-       if (cmd->scan_end_arg != cmd->chanlist_len) {
-               cmd->scan_end_arg = cmd->chanlist_len;
-               err++;
-       }
-       if (cmd->stop_src == TRIG_NONE) {
-               /* 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_NONE)
+               err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
        if (err)
                return 3;