[PATCH 58/77] staging: comedi: usbduxsigma: rename usbdux_pwm_cancel()

H Hartley Sweeten hsweeten at visionengravers.com
Thu May 23 20:03:26 UTC 2013


Rename the function so it has namespace associated with the driver.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/usbduxsigma.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
index 79f714c..e4a80fc 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;
-- 
1.8.1.4




More information about the devel mailing list