From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 30 Jul 2013 00:44:14 +0000 (-0700)
Subject: staging: comedi: usbdux: tidy up usbdux_pwm_period()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9fe4df4db1350a5075b617bfda40b423f161bb6f;p=openwrt%2Fstaging%2Fblogic.git

staging: comedi: usbdux: tidy up usbdux_pwm_period()

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>
---

diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index bf6c9ffa93ee..0683c8e644bb 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -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;
 }