staging: comedi: amplc_pci224: only calc the pacer divisors once
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 23 Apr 2014 22:57:19 +0000 (15:57 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Apr 2014 22:02:59 +0000 (15:02 -0700)
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>
drivers/staging/comedi/drivers/amplc_pci224.c

index 37a81b7..f0b04ca 100644 (file)
@@ -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