diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-02-10 23:20:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-14 18:31:31 +0100 |
| commit | c599235902f653f3eb42546cbf8299da1c445e45 (patch) | |
| tree | eb4134f661f9205f54f375617392909cf2be9adc | |
| parent | staging: comedi: das800: trigger sources are validated in (*do_cmdtest) (diff) | |
| download | linux-c599235902f653f3eb42546cbf8299da1c445e45.tar.xz linux-c599235902f653f3eb42546cbf8299da1c445e45.zip | |
staging: comedi: pcl812: trigger sources were validated in (*do_cmdtest)
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/pcl812.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c index feb9e98524aa..095b3253054a 100644 --- a/drivers/staging/comedi/drivers/pcl812.c +++ b/drivers/staging/comedi/drivers/pcl812.c @@ -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; |