staging: comedi: das800: remove extra divisor calculation call
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 23 Apr 2013 01:36:11 +0000 (18:36 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 23 Apr 2013 17:41:51 +0000 (10:41 -0700)
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>
drivers/staging/comedi/drivers/das800.c

index 642eae4..b68c741 100644 (file)
@@ -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;