staging: comedi: dt3000: use comedi_fc helpers to validate timer args

Use the comedi_fc helper, cfc_check_trigger_arg_is(), to validate the
cmd->scan_begin_arg for the scan_begin_src TRIG_TIMER. Pass the local
variable to dt2k_ns_to_timer() instead of the cmd argument. This value
is modified by that function to return the actual time (in nanoseconds)
that the timer will be programmed with based on the calculated divisor.
The cfc_check_trigger_arg_is() helper will then validate that the
cmd->cscan_begin_arg is that value and modify it if not.

Also use cfc_check_trigger_arg_is() to validate the cmd->convert_arg
using the same logic.

Use cfc_check_trigger_arg_min() to do validate the cmd->scan_begin_arg
when the convert_src and scan_begin_src are both TRIG_TIMER.

All the arguments are unsigned int, change the local variable to an
unsigned int and rename it for aesthetic reasons.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index abd999f..4ab4de0 100644 (file)
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -416,7 +416,7 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
 {
        const struct dt3k_boardtype *this_board = comedi_board(dev);
        int err = 0;
-       int tmp;
+       unsigned int arg;
 
        /* Step 1 : check if triggers are trivially valid */
 
@@ -466,25 +466,20 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
        /* step 4: fix up any arguments */
 
        if (cmd->scan_begin_src == TRIG_TIMER) {
-               tmp = cmd->scan_begin_arg;
-               dt3k_ns_to_timer(100, &cmd->scan_begin_arg,
-                                cmd->flags & TRIG_ROUND_MASK);
-               if (tmp != cmd->scan_begin_arg)
-                       err++;
+               arg = cmd->scan_begin_arg;
+               dt3k_ns_to_timer(100, &arg, cmd->flags & TRIG_ROUND_MASK);
+               err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, arg);
        }
 
        if (cmd->convert_src == TRIG_TIMER) {
-               tmp = cmd->convert_arg;
-               dt3k_ns_to_timer(50, &cmd->convert_arg,
-                                cmd->flags & TRIG_ROUND_MASK);
-               if (tmp != cmd->convert_arg)
-                       err++;
-               if (cmd->scan_begin_src == TRIG_TIMER &&
-                   cmd->scan_begin_arg <
-                   cmd->convert_arg * cmd->scan_end_arg) {
-                       cmd->scan_begin_arg =
-                           cmd->convert_arg * cmd->scan_end_arg;
-                       err++;
+               arg = cmd->convert_arg;
+               dt3k_ns_to_timer(50, &arg, cmd->flags & TRIG_ROUND_MASK);
+               err |= cfc_check_trigger_arg_is(&cmd->convert_arg, arg);
+
+               if (cmd->scan_begin_src == TRIG_TIMER) {
+                       arg = cmd->convert_arg * cmd->scan_end_arg;
+                       err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
+                                                        arg);
                }
        }