staging: comedi: pcl818: 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.

The minimum test is not needed, this was already validated in Step 3.

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/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
index b960b66bc9a80e44b10dc9747855336aa0024499..48b81c39c6a82efce5237bdf75932200598ba170 100644 (file)
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -741,7 +741,7 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
        const struct pcl818_board *board = comedi_board(dev);
        struct pcl818_private *devpriv = dev->private;
        int err = 0;
-       int tmp;
+       unsigned int arg;
 
        /* Step 1 : check if triggers are trivially valid */
 
@@ -788,15 +788,12 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
        /* step 4: fix up any arguments */
 
        if (cmd->convert_src == TRIG_TIMER) {
-               tmp = cmd->convert_arg;
+               arg = cmd->convert_arg;
                i8253_cascade_ns_to_timer(devpriv->i8253_osc_base,
                                          &devpriv->divisor1,
                                          &devpriv->divisor2,
-                                         &cmd->convert_arg, cmd->flags);
-               if (cmd->convert_arg < board->ns_min)
-                       cmd->convert_arg = board->ns_min;
-               if (tmp != cmd->convert_arg)
-                       err++;
+                                         &arg, cmd->flags);
+               err |= cfc_check_trigger_arg_is(&cmd->convert_arg, arg);
        }
 
        if (err)