Commit 440b2168 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: usbduxsigma: tidy up usbdux_pwm_period()

Rename the function so it has namespace associated with the driver.
Rename the local variable used for the private data pointer.

Modify the fx2delay calculation to remove the floating point values.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cf9b4634
...@@ -1230,21 +1230,22 @@ static int usbduxsigma_submit_pwm_urb(struct comedi_device *dev) ...@@ -1230,21 +1230,22 @@ static int usbduxsigma_submit_pwm_urb(struct comedi_device *dev)
return usb_submit_urb(urb, GFP_ATOMIC); return usb_submit_urb(urb, GFP_ATOMIC);
} }
static int usbdux_pwm_period(struct comedi_device *dev, static int usbduxsigma_pwm_period(struct comedi_device *dev,
struct comedi_subdevice *s, unsigned int period) struct comedi_subdevice *s,
unsigned int period)
{ {
struct usbduxsigma_private *this_usbduxsub = dev->private; struct usbduxsigma_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->pwmDelay = fx2delay; devpriv->pwmDelay = fx2delay;
this_usbduxsub->pwmPeriod = period; devpriv->pwmPeriod = period;
return 0; return 0;
} }
...@@ -1344,7 +1345,7 @@ static int usbduxsigma_pwm_config(struct comedi_device *dev, ...@@ -1344,7 +1345,7 @@ static int usbduxsigma_pwm_config(struct comedi_device *dev,
data[1] = devpriv->pwm_cmd_running; data[1] = devpriv->pwm_cmd_running;
return 0; return 0;
case INSN_CONFIG_PWM_SET_PERIOD: case INSN_CONFIG_PWM_SET_PERIOD:
return usbdux_pwm_period(dev, s, data[1]); return usbduxsigma_pwm_period(dev, s, data[1]);
case INSN_CONFIG_PWM_GET_PERIOD: case INSN_CONFIG_PWM_GET_PERIOD:
data[1] = devpriv->pwmPeriod; data[1] = devpriv->pwmPeriod;
return 0; return 0;
...@@ -1482,7 +1483,7 @@ static int usbduxsigma_attach_common(struct comedi_device *dev) ...@@ -1482,7 +1483,7 @@ static int usbduxsigma_attach_common(struct comedi_device *dev)
s->insn_write = usbduxsigma_pwm_write; s->insn_write = usbduxsigma_pwm_write;
s->insn_config = usbduxsigma_pwm_config; s->insn_config = usbduxsigma_pwm_config;
usbdux_pwm_period(dev, s, PWM_DEFAULT_PERIOD); usbduxsigma_pwm_period(dev, s, PWM_DEFAULT_PERIOD);
} }
up(&devpriv->sem); up(&devpriv->sem);
......
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