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

Use the new helpers in the step 3 tests of pcl711_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/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c
index f9c15aa45fea04a79bb44181d4b347889f01e3e9..6ee5da24a961853e64c369d1d9e9c8e1faf11b47 100644 (file)
--- a/drivers/staging/comedi/drivers/pcl711.c
+++ b/drivers/staging/comedi/drivers/pcl711.c
@@ -289,38 +289,24 @@ static int pcl711_ai_cmdtest(struct comedi_device *dev,
        if (err)
                return 2;
 
-       /* step 3 */
+       /* 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++;
-       }
        if (cmd->scan_begin_src == TRIG_EXT) {
-               if (cmd->scan_begin_arg != 0) {
-                       cmd->scan_begin_arg = 0;
-                       err++;
-               }
+               err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
        } else {
 #define MAX_SPEED 1000
 #define TIMER_BASE 100
-               if (cmd->scan_begin_arg < MAX_SPEED) {
-                       cmd->scan_begin_arg = MAX_SPEED;
-                       err++;
-               }
-       }
-       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_min(&cmd->scan_begin_arg,
+                                                MAX_SPEED);
        }
+
+       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_NONE) {
-               if (cmd->stop_arg != 0) {
-                       cmd->stop_arg = 0;
-                       err++;
-               }
+               err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
        } else {
                /* ignore */
        }