From: H Hartley Sweeten Date: Tue, 9 Sep 2014 23:15:44 +0000 (-0700) Subject: staging: comedi: amplc_pci230: 'ai_scan_count' is always 'stop_arg' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1dabb50199791d60b15ddfc958a8b56e5ea26460;p=linux-beck.git staging: comedi: amplc_pci230: 'ai_scan_count' is always 'stop_arg' When the cmd->stop_src == TRIG_COUNT, the 'ai_scan_count' is the cmd->stop_arg. For any other stop_src the 'ai_scan_count' is 0, which is also the cmd->stop_arg. Simplify the 'ai_scan_count' initialization. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c index a0bf4600c992..01796cd28e5b 100644 --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c @@ -2177,11 +2177,7 @@ static int pci230_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) if (!pci230_claim_shared(dev, res_mask, OWNER_AICMD)) return -EBUSY; - /* Get number of scans required. */ - if (cmd->stop_src == TRIG_COUNT) - devpriv->ai_scan_count = cmd->stop_arg; - else /* TRIG_NONE, user calls cancel */ - devpriv->ai_scan_count = 0; + devpriv->ai_scan_count = cmd->stop_arg; devpriv->ai_scan_pos = 0; /* Position within scan. */ /*