Commit 264601c2 authored Apr 22, 2013 by H Hartley Sweeten Committed by Greg Kroah-Hartman Apr 23, 2013

staging: comedi: das800: remove extra divisor calculation call



The comedi core always calls the (*do_cmdtest) function before it
calls the (*do_cmd) function. The divisors were already calculated
in das800_ai_do_cmdtest(), it is not necessary to calculate them
again in das800_ai_do_cmd().

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>

parent 57d1ebf7

drivers/staging/comedi/drivers/das800.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -453,11 +453,6 @@ static int das800_ai_do_cmd(struct comedi_device *dev,
		case TRIG_TIMER:
		conv_bits \|= CASC \| ITE;
		/* set conversion frequency */
		i8253_cascade_ns_to_timer_2div(TIMER_BASE, &(devpriv->divisor1),
		&(devpriv->divisor2),
		&(async->cmd.convert_arg),
		async->cmd.
		flags & TRIG_ROUND_MASK);
		if (das800_set_frequency(dev) < 0) {
		comedi_error(dev, "Error setting up counters");
		return -1;