From a65b091554965e292b5b10977ecffacff74d8908 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 23 May 2013 12:59:24 -0700 Subject: [PATCH] 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: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/usbduxsigma.c | 23 ++++++++------------ 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c index e0358daab2a0..44043c5127b1 100644 --- a/drivers/staging/comedi/drivers/usbduxsigma.c +++ b/drivers/staging/comedi/drivers/usbduxsigma.c @@ -1297,31 +1297,26 @@ static int usbdux_pwm_period(struct comedi_device *dev, return 0; } -/* is called from insn so there's no need to do all the sanity checks */ -static int usbdux_pwm_start(struct comedi_device *dev, - struct comedi_subdevice *s) +static int usbduxsigma_pwm_start(struct comedi_device *dev, + struct comedi_subdevice *s) { - struct usbduxsigma_private *this_usbduxsub = dev->private; - int ret, i; + struct usbduxsigma_private *devpriv = dev->private; + int ret; - if (this_usbduxsub->pwm_cmd_running) { - /* already running */ + if (devpriv->pwm_cmd_running) return 0; - } - this_usbduxsub->dux_commands[1] = ((uint8_t) this_usbduxsub->pwmDelay); + devpriv->dux_commands[1] = devpriv->pwmDelay; ret = send_dux_commands(dev, SENDPWMON); if (ret < 0) return ret; - /* initialise the buffer */ - for (i = 0; i < this_usbduxsub->sizePwmBuf; i++) - ((char *)(this_usbduxsub->urbPwm->transfer_buffer))[i] = 0; + memset(devpriv->urbPwm->transfer_buffer, 0, devpriv->sizePwmBuf); ret = usbduxsigma_submit_pwm_urb(dev); if (ret < 0) return ret; - this_usbduxsub->pwm_cmd_running = 1; + devpriv->pwm_cmd_running = 1; return 0; } @@ -1391,7 +1386,7 @@ static int usbduxsigma_pwm_config(struct comedi_device *dev, */ if (data[1] != 0) return -EINVAL; - return usbdux_pwm_start(dev, s); + return usbduxsigma_pwm_start(dev, s); case INSN_CONFIG_DISARM: return usbdux_pwm_cancel(dev, s); case INSN_CONFIG_GET_PWM_STATUS: -- 2.20.1