From: H Hartley Sweeten Date: Wed, 23 Apr 2014 22:57:19 +0000 (-0700) Subject: staging: comedi: amplc_pci224: only calc the pacer divisors once X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=43268701b50e7dbbad767e118e0023c703c7e3da;p=deliverable%2Flinux.git 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 Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c index 37a81b72633f..f0b04cac4a6e 100644 --- a/drivers/staging/comedi/drivers/amplc_pci224.c +++ b/drivers/staging/comedi/drivers/amplc_pci224.c @@ -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