staging: comedi: adv_pci1710: cmd->scan_begin_src can only be TRIG_FOLLOW

In Step 1 of the (*do_cmdtest), the cmd->scan_begin_src is checked to
only allow TRIG_FOLLOW. The (*do_cmd) does not need to recheck this.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 9ce05353d12b0d916c57784637a606f993139cbc..60b926e5062accf468ee75bd37abc4a5320a7300 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1115,15 +1115,13 @@ static int pci171x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
        struct comedi_cmd *cmd = &s->async->cmd;
 
-       if (cmd->scan_begin_src == TRIG_FOLLOW) {       /*  mode 1, 2, 3 */
-               if (cmd->convert_src == TRIG_TIMER) {   /*  mode 1 and 2 */
-                       return pci171x_ai_docmd_and_mode(cmd->start_src ==
-                                                        TRIG_EXT ? 2 : 1, dev,
-                                                        s);
-               }
-               if (cmd->convert_src == TRIG_EXT) {     /*  mode 3 */
-                       return pci171x_ai_docmd_and_mode(3, dev, s);
-               }
+       if (cmd->convert_src == TRIG_TIMER) {   /*  mode 1 and 2 */
+               return pci171x_ai_docmd_and_mode(cmd->start_src ==
+                                                TRIG_EXT ? 2 : 1, dev,
+                                                s);
+       }
+       if (cmd->convert_src == TRIG_EXT) {     /*  mode 3 */
+               return pci171x_ai_docmd_and_mode(3, dev, s);
        }
 
        return -1;