Commit 43268701 authored Apr 23, 2014 by H Hartley Sweeten Committed by Greg Kroah-Hartman Apr 25, 2014

staging: comedi: amplc_pci224: only calc the pacer divisors once



When the cmd->scan_begin_src == TRIG_TIMER the divisors needed to
generate the pacer time are calculated in the (*do_cmdtest) to
validate the cmd->scan_begin_arg. The core always does the
(*do_cmdtest) before the (*do_cmd) so there is no reason to recalc
the divisors.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent afb2bf14

drivers/staging/comedi/drivers/amplc_pci224.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -869,14 +869,6 @@ static void pci224_ao_start_pacer(struct comedi_device *dev,
		struct comedi_subdevice *s)
		{
		struct pci224_private *devpriv = dev->private;
		struct comedi_cmd *cmd = &s->async->cmd;

		/* Use two timers. */
		i8253_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,
		&devpriv->cached_div1,
		&devpriv->cached_div2,
		&cmd->scan_begin_arg,
		cmd->flags);

		/*
		* The output of timer Z2-0 will be used as the scan trigger