staging: comedi: pcl818: remove unneeded tests in ai_cmdtest
authorH Hartley Sweeten <hartleys@visionengravers.com>
Thu, 14 Jun 2012 00:41:35 +0000 (17:41 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Jun 2012 00:25:47 +0000 (17:25 -0700)
The step 2 tests of the start_src, scan_begin_src, and scan_end_src
triggers to make sure they are unique are not needed.  These triggers
all only have one source and it was 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>
drivers/staging/comedi/drivers/pcl818.c

index 66b2570fb24eb9a05827bb1f36c616a038f78c35..786c3b6442a6c11e5707ef8d1be0ccb9f861eb3e 100644 (file)
@@ -1299,22 +1299,9 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
 
        /* step 2: make sure trigger sources are 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 (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++;