staging: comedi: ni_at_a2150: use comedi_fc helpers to validate timer arg

Use the comedi_fc helper cfc_check_trigger_arg_is() to validate the
trigger argument when the source is 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/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c
index f8d6bfce17e6b4f90cb9d09944aba7bd97261c95..5bd19494dbf653353cc242fae2d8d02ccd73c070 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -334,7 +334,7 @@ static int a2150_ai_cmdtest(struct comedi_device *dev,
 {
        const struct a2150_board *thisboard = comedi_board(dev);
        int err = 0;
-       int tmp;
+       unsigned int arg;
 
        /* Step 1 : check if triggers are trivially valid */
 
@@ -379,10 +379,9 @@ static int a2150_ai_cmdtest(struct comedi_device *dev,
        /* step 4: fix up any arguments */
 
        if (cmd->scan_begin_src == TRIG_TIMER) {
-               tmp = cmd->scan_begin_arg;
-               a2150_get_timing(dev, &cmd->scan_begin_arg, cmd->flags);
-               if (tmp != cmd->scan_begin_arg)
-                       err++;
+               arg = cmd->scan_begin_arg;
+               a2150_get_timing(dev, &arg, cmd->flags);
+               err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, arg);
        }
 
        if (err)