diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-07-29 17:44:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-31 17:44:53 -0700 |
| commit | 9fe4df4db1350a5075b617bfda40b423f161bb6f (patch) | |
| tree | 0e8cb1581c0e7c33d78def21aed8a0e6dab1d493 | |
| parent | b509a76aff183e5b12858da6feaf4f896cf2af09 (diff) | |
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/usbdux.c | 11 |
1 files changed, 6 insertions, 5 deletions
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; } |