Skip to content

Commit

Permalink
staging: comedi: pcl812: remove unneeded tests in pcl812_ai_cmdtest
Browse files Browse the repository at this point in the history
The step 2 tests to make sure that the triggers are unique is not
needed for single source triggers. These were already trivially
validated in step 1.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 15, 2012
1 parent f7f111c commit 31a4590
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions drivers/staging/comedi/drivers/pcl812.c
Original file line number Diff line number Diff line change
Expand Up @@ -612,33 +612,6 @@ static int pcl812_ai_cmdtest(struct comedi_device *dev,
* unique and mutually compatible
*/

if (cmd->start_src != TRIG_NOW) {
cmd->start_src = TRIG_NOW;
err++;
}

if (cmd->scan_begin_src != TRIG_FOLLOW) {
cmd->scan_begin_src = TRIG_FOLLOW;
err++;
}

if (devpriv->use_ext_trg) {
if (cmd->convert_src != TRIG_EXT) {
cmd->convert_src = TRIG_EXT;
err++;
}
} else {
if (cmd->convert_src != TRIG_TIMER) {
cmd->convert_src = TRIG_TIMER;
err++;
}
}

if (cmd->scan_end_src != TRIG_COUNT) {
cmd->scan_end_src = TRIG_COUNT;
err++;
}

if (cmd->stop_src != TRIG_NONE && cmd->stop_src != TRIG_COUNT)
err++;

Expand Down

0 comments on commit 31a4590

Please sign in to comment.