From 06f55bb778390f5adbaa21c554505b3a4d27ff38 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Sep 2014 16:15:36 -0700 Subject: [PATCH] staging: comedi: amplc_dio200_common: 'stopcount' is always 'stop_arg' 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/amplc_dio200_common.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/comedi/drivers/amplc_dio200_common.c b/drivers/staging/comedi/drivers/amplc_dio200_common.c index b13f9a2757ad..107e45a89771 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200_common.c +++ b/drivers/staging/comedi/drivers/amplc_dio200_common.c @@ -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; -- 2.30.2