diff options
| author | H Hartley Sweeten | 2014-09-10 01:15:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-09-11 23:35:20 +0200 |
| commit | 1dabb50199791d60b15ddfc958a8b56e5ea26460 (patch) | |
| tree | f46132e836c608bdc477a3309f357bce1a56b8aa /drivers/staging/comedi | |
| parent | staging: comedi: amplc_pci230: remove analog input "empty acquisition" async ... (diff) | |
| download | kernel-qcow2-linux-1dabb50199791d60b15ddfc958a8b56e5ea26460.tar.gz kernel-qcow2-linux-1dabb50199791d60b15ddfc958a8b56e5ea26460.tar.xz kernel-qcow2-linux-1dabb50199791d60b15ddfc958a8b56e5ea26460.zip | |
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 <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_pci230.c | 6 |
1 files changed, 1 insertions, 5 deletions
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. */ /* |