]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: amplc_dio200_common: 'stopcount' is always 'stop_arg'
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Sep 2014 23:15:36 +0000 (16:15 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Sep 2014 21:35:20 +0000 (14:35 -0700)
When the cmd->stop_src == TRIG_COUNT, the 'stopcount' is the cmd->stop_arg. When
the stop_src == TRIG_NONE the 'stopcount' is 0, which is also the cmd->stop_arg.

Simplify the 'stopcount' initialization.

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>
drivers/staging/comedi/drivers/amplc_dio200_common.c

index b13f9a2757ad41ff93c91d48daa1935d280a4afa..107e45a89771e3af18a04eb6bf49c88c72b470be 100644 (file)
@@ -441,13 +441,9 @@ static int dio200_subdev_intr_cmd(struct comedi_device *dev,
        int event = 0;
 
        spin_lock_irqsave(&subpriv->spinlock, flags);
-       subpriv->active = true;
 
-       /* Set up end of acquisition. */
-       if (cmd->stop_src == TRIG_COUNT)
-               subpriv->stopcount = cmd->stop_arg;
-       else    /* TRIG_NONE */
-               subpriv->stopcount = 0;
+       subpriv->active = true;
+       subpriv->stopcount = cmd->stop_arg;
 
        if (cmd->start_src == TRIG_INT)
                s->async->inttrig = dio200_inttrig_start_intr;