staging: comedi: usbdux: tidy up usbdux_pwm_period()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 30 Jul 2013 00:44:14 +0000 (17:44 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Aug 2013 00:44:53 +0000 (17:44 -0700)
Rename the local variable used for the private data pointer to 'devpriv'.

Fix the fx2delay calculation so it does not use floating point values.

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/usbdux.c

index bf6c9ffa93eeeb0a4fb3573b70fd28761ca82f07..0683c8e644bb77bb5ed8e569dc08789d3106028a 100644 (file)
@@ -1347,20 +1347,21 @@ static int usbduxsub_submit_pwm_urbs(struct comedi_device *dev)
 }
 
 static int usbdux_pwm_period(struct comedi_device *dev,
-                            struct comedi_subdevice *s, unsigned int period)
+                            struct comedi_subdevice *s,
+                            unsigned int period)
 {
-       struct usbdux_private *this_usbduxsub = dev->private;
+       struct usbdux_private *devpriv = dev->private;
        int fx2delay = 255;
 
        if (period < MIN_PWM_PERIOD) {
                return -EAGAIN;
        } else {
-               fx2delay = period / ((int)(6 * 512 * (1.0 / 0.033))) - 6;
+               fx2delay = (period / (6 * 512 * 1000 / 33)) - 6;
                if (fx2delay > 255)
                        return -EAGAIN;
        }
-       this_usbduxsub->pwm_delay = fx2delay;
-       this_usbduxsub->pwm_period = period;
+       devpriv->pwm_delay = fx2delay;
+       devpriv->pwm_period = period;
 
        return 0;
 }