Commit 9fe4df4d authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b509a76a
...@@ -1347,20 +1347,21 @@ static int usbduxsub_submit_pwm_urbs(struct comedi_device *dev) ...@@ -1347,20 +1347,21 @@ static int usbduxsub_submit_pwm_urbs(struct comedi_device *dev)
} }
static int usbdux_pwm_period(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; int fx2delay = 255;
if (period < MIN_PWM_PERIOD) { if (period < MIN_PWM_PERIOD) {
return -EAGAIN; return -EAGAIN;
} else { } else {
fx2delay = period / ((int)(6 * 512 * (1.0 / 0.033))) - 6; fx2delay = (period / (6 * 512 * 1000 / 33)) - 6;
if (fx2delay > 255) if (fx2delay > 255)
return -EAGAIN; return -EAGAIN;
} }
this_usbduxsub->pwm_delay = fx2delay; devpriv->pwm_delay = fx2delay;
this_usbduxsub->pwm_period = period; devpriv->pwm_period = period;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment