summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-05-23 13:03:26 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-30 20:41:06 +0900
commitfd245192b1ddae96a4bcf430fe26b4130a72f1f0 (patch)
tree4ea92cfec134986c6eae177c0dae10e40ad791de
parentaff4dd068c9fdd7836522945e18e75a58b6bbd15 (diff)
staging: comedi: usbduxsigma: rename usbdux_pwm_cancel()
Rename the function so it has namespace associated with the driver. 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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
index 79f714c7c305..e4a80fc65170 100644
--- a/drivers/staging/comedi/drivers/usbduxsigma.c
+++ b/drivers/staging/comedi/drivers/usbduxsigma.c
@@ -1157,8 +1157,8 @@ static void usbdux_pwm_stop(struct usbduxsigma_private *devpriv, int do_unlink)
devpriv->pwm_cmd_running = 0;
}
-static int usbdux_pwm_cancel(struct comedi_device *dev,
- struct comedi_subdevice *s)
+static int usbduxsigma_pwm_cancel(struct comedi_device *dev,
+ struct comedi_subdevice *s)
{
struct usbduxsigma_private *devpriv = dev->private;
@@ -1340,7 +1340,7 @@ static int usbduxsigma_pwm_config(struct comedi_device *dev,
return -EINVAL;
return usbduxsigma_pwm_start(dev, s);
case INSN_CONFIG_DISARM:
- return usbdux_pwm_cancel(dev, s);
+ return usbduxsigma_pwm_cancel(dev, s);
case INSN_CONFIG_GET_PWM_STATUS:
data[1] = devpriv->pwm_cmd_running;
return 0;