]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: pcl812: trigger sources were validated in (*do_cmdtest)
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 10 Feb 2014 22:20:36 +0000 (15:20 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 Feb 2014 17:31:31 +0000 (09:31 -0800)
The trigger sources were already validataed in the (*do_cmdtest) before the
(*do_cmd) is called. Remove the unnecessary checks in pcl812_ai_cmd().

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>
drivers/staging/comedi/drivers/pcl812.c

index feb9e98524aa906ee660622d91be81ac2c44691e..095b3253054af20c4efd7bf03c8807e00401c15e 100644 (file)
@@ -631,24 +631,6 @@ static int pcl812_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
        unsigned int divisor1 = 0, divisor2 = 0, i, dma_flags, bytes;
        struct comedi_cmd *cmd = &s->async->cmd;
 
-       if (cmd->start_src != TRIG_NOW)
-               return -EINVAL;
-       if (cmd->scan_begin_src != TRIG_FOLLOW)
-               return -EINVAL;
-       if (devpriv->use_ext_trg) {
-               if (cmd->convert_src != TRIG_EXT)
-                       return -EINVAL;
-       } else {
-               if (cmd->convert_src != TRIG_TIMER)
-                       return -EINVAL;
-       }
-       if (cmd->scan_end_src != TRIG_COUNT)
-               return -EINVAL;
-       if (cmd->scan_end_arg != cmd->chanlist_len)
-               return -EINVAL;
-       if (cmd->chanlist_len > MAX_CHANLIST_LEN)
-               return -EINVAL;
-
        if (cmd->convert_src == TRIG_TIMER) {
                if (cmd->convert_arg < board->ai_ns_min)
                        cmd->convert_arg = board->ai_ns_min;