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

staging: comedi: usbduxsigma: tidy up usbdux_pwm_start()

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

Remove the unnecessary cast of the pwm delay.

Use memset to initialize the buffer instead of the for loop.
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 ab58a6e3
...@@ -1297,31 +1297,26 @@ static int usbdux_pwm_period(struct comedi_device *dev, ...@@ -1297,31 +1297,26 @@ static int usbdux_pwm_period(struct comedi_device *dev,
return 0; return 0;
} }
/* is called from insn so there's no need to do all the sanity checks */ static int usbduxsigma_pwm_start(struct comedi_device *dev,
static int usbdux_pwm_start(struct comedi_device *dev, struct comedi_subdevice *s)
struct comedi_subdevice *s)
{ {
struct usbduxsigma_private *this_usbduxsub = dev->private; struct usbduxsigma_private *devpriv = dev->private;
int ret, i; int ret;
if (this_usbduxsub->pwm_cmd_running) { if (devpriv->pwm_cmd_running)
/* already running */
return 0; return 0;
}
this_usbduxsub->dux_commands[1] = ((uint8_t) this_usbduxsub->pwmDelay); devpriv->dux_commands[1] = devpriv->pwmDelay;
ret = send_dux_commands(dev, SENDPWMON); ret = send_dux_commands(dev, SENDPWMON);
if (ret < 0) if (ret < 0)
return ret; return ret;
/* initialise the buffer */ memset(devpriv->urbPwm->transfer_buffer, 0, devpriv->sizePwmBuf);
for (i = 0; i < this_usbduxsub->sizePwmBuf; i++)
((char *)(this_usbduxsub->urbPwm->transfer_buffer))[i] = 0;
ret = usbduxsigma_submit_pwm_urb(dev); ret = usbduxsigma_submit_pwm_urb(dev);
if (ret < 0) if (ret < 0)
return ret; return ret;
this_usbduxsub->pwm_cmd_running = 1; devpriv->pwm_cmd_running = 1;
return 0; return 0;
} }
...@@ -1391,7 +1386,7 @@ static int usbduxsigma_pwm_config(struct comedi_device *dev, ...@@ -1391,7 +1386,7 @@ static int usbduxsigma_pwm_config(struct comedi_device *dev,
*/ */
if (data[1] != 0) if (data[1] != 0)
return -EINVAL; return -EINVAL;
return usbdux_pwm_start(dev, s); return usbduxsigma_pwm_start(dev, s);
case INSN_CONFIG_DISARM: case INSN_CONFIG_DISARM:
return usbdux_pwm_cancel(dev, s); return usbdux_pwm_cancel(dev, s);
case INSN_CONFIG_GET_PWM_STATUS: case INSN_CONFIG_GET_PWM_STATUS:
......
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