staging: comedi: pcl812: remove unneeded tests in pcl812_ai_cmdtest
authorH Hartley Sweeten <hartleys@visionengravers.com>
Thu, 14 Jun 2012 00:58:07 +0000 (17:58 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Jun 2012 00:25:47 +0000 (17:25 -0700)
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>
drivers/staging/comedi/drivers/pcl812.c

index 0a4074af8a6029fab8ecb476b0ee09144375fb7e..511c90136439293ef5dbea357500892198f09c00 100644 (file)
@@ -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++;