summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorH Hartley Sweeten2014-09-10 01:15:42 +0200
committerGreg Kroah-Hartman2014-09-11 23:35:20 +0200
commit6fabddd2261a84a4dbb4aac61baa7b4652c126e1 (patch)
treefa656370c6d72ad436c98d78d4588ef67f22be91 /drivers/staging/comedi
parentstaging: comedi: amplc_pci230: remove analog output "empty acquisition" async... (diff)
downloadkernel-qcow2-linux-6fabddd2261a84a4dbb4aac61baa7b4652c126e1.tar.gz
kernel-qcow2-linux-6fabddd2261a84a4dbb4aac61baa7b4652c126e1.tar.xz
kernel-qcow2-linux-6fabddd2261a84a4dbb4aac61baa7b4652c126e1.zip
staging: comedi: amplc_pci230: 'ao_scan_count' is always 'stop_arg'
When the cmd->stop_src == TRIG_COUNT, the 'ao_scan_count' is the cmd->stop_arg. For any other stop_src the 'ao_scan_count' is 0, which is also the cmd->stop_arg. Simplify the 'ao_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.c6
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 886186d00d4d..a4d94f2605a3 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -1354,11 +1354,7 @@ static int pci230_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
return -EBUSY;
}
- /* Get number of scans required. */
- if (cmd->stop_src == TRIG_COUNT)
- devpriv->ao_scan_count = cmd->stop_arg;
- else /* TRIG_NONE, user calls cancel */
- devpriv->ao_scan_count = 0;
+ devpriv->ao_scan_count = cmd->stop_arg;
/*
* Set range - see analogue output range table; 0 => unipolar 10V,