diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-05-23 13:03:45 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-30 20:41:06 +0900 |
| commit | 8cd6f5ebb618d5ae1017e6cfae330cf27002b205 (patch) | |
| tree | d2dd0398094cc3513a72dbce82d8a920455d1922 | |
| parent | fd245192b1ddae96a4bcf430fe26b4130a72f1f0 (diff) | |
staging: comedi: usbduxsigma: rename usbdux_pwm_stop()
Rename the function so it has namespace associated with the driver.
For aesthetic reasons, pass the comedi_device pointer instead of the
private data pointer as the first parameter.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/usbduxsigma.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c index e4a80fc65170..9a5f7ef1590a 100644 --- a/drivers/staging/comedi/drivers/usbduxsigma.c +++ b/drivers/staging/comedi/drivers/usbduxsigma.c @@ -1147,8 +1147,10 @@ done: return ret; } -static void usbdux_pwm_stop(struct usbduxsigma_private *devpriv, int do_unlink) +static void usbduxsigma_pwm_stop(struct comedi_device *dev, int do_unlink) { + struct usbduxsigma_private *devpriv = dev->private; + if (do_unlink) { if (devpriv->urbPwm) usb_kill_urb(devpriv->urbPwm); @@ -1163,7 +1165,7 @@ static int usbduxsigma_pwm_cancel(struct comedi_device *dev, struct usbduxsigma_private *devpriv = dev->private; /* unlink only if it is really running */ - usbdux_pwm_stop(devpriv, devpriv->pwm_cmd_running); + usbduxsigma_pwm_stop(dev, devpriv->pwm_cmd_running); return send_dux_commands(dev, SENDPWMOFF); } @@ -1185,7 +1187,7 @@ static void usbduxsigma_pwm_irq(struct urb *urb) case -ECONNABORTED: /* happens after an unlink command */ if (devpriv->pwm_cmd_running) - usbdux_pwm_stop(devpriv, 0); /* w/o unlink */ + usbduxsigma_pwm_stop(dev, 0); /* w/o unlink */ return; default: @@ -1194,7 +1196,7 @@ static void usbduxsigma_pwm_irq(struct urb *urb) dev_err(dev->class_dev, "%s: non-zero urb status (%d)\n", __func__, urb->status); - usbdux_pwm_stop(devpriv, 0); /* w/o unlink */ + usbduxsigma_pwm_stop(dev, 0); /* w/o unlink */ } return; } @@ -1212,7 +1214,7 @@ static void usbduxsigma_pwm_irq(struct urb *urb) if (ret == EL2NSYNC) dev_err(dev->class_dev, "buggy USB host controller or bug in IRQ handler\n"); - usbdux_pwm_stop(devpriv, 0); /* w/o unlink */ + usbduxsigma_pwm_stop(dev, 0); /* w/o unlink */ } } @@ -1665,7 +1667,7 @@ static void usbduxsigma_free_usb_buffers(struct comedi_device *dev) /* force unlink all urbs */ usbdux_ai_stop(devpriv, 1); usbdux_ao_stop(devpriv, 1); - usbdux_pwm_stop(devpriv, 1); + usbduxsigma_pwm_stop(dev, 1); urb = devpriv->urbPwm; if (urb) { |