staging: comedi: adv_pci1710: single source triggers are unique
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 11 Sep 2012 22:09:23 +0000 (15:09 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 12 Sep 2012 16:29:22 +0000 (09:29 -0700)
If a single source trigger passes "step 1" of the do_cmdtest function
they are already unique. There is no need to recheck them.

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/adv_pci1710.c

index 379a7134230ad1dbdc38443ee5bd7330cdea4e00..6fbf566d84a180be48083d7ad340a5051733d3d8 100644 (file)
@@ -1064,19 +1064,9 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
                err++;
        }
 
-       if (cmd->scan_begin_src != TRIG_FOLLOW) {
-               cmd->scan_begin_src = TRIG_FOLLOW;
-               err++;
-       }
-
        if (cmd->convert_src != TRIG_TIMER && cmd->convert_src != TRIG_EXT)
                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++;