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

staging: comedi: usbduxsigma: rename the (*cancel) functions

Rename these functions so they have namespace associated with the
driver.
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 702cd2dd
......@@ -227,7 +227,7 @@ static void usbdux_ai_stop(struct usbduxsigma_private *devpriv, int do_unlink)
devpriv->ai_cmd_running = 0;
}
static int usbdux_ai_cancel(struct comedi_device *dev,
static int usbduxsigma_ai_cancel(struct comedi_device *dev,
struct comedi_subdevice *s)
{
struct usbduxsigma_private *devpriv = dev->private;
......@@ -368,7 +368,7 @@ static void usbdux_ao_stop(struct usbduxsigma_private *devpriv, int do_unlink)
devpriv->ao_cmd_running = 0;
}
static int usbdux_ao_cancel(struct comedi_device *dev,
static int usbduxsigma_ao_cancel(struct comedi_device *dev,
struct comedi_subdevice *s)
{
struct usbduxsigma_private *devpriv = dev->private;
......@@ -1433,7 +1433,7 @@ static int usbduxsigma_attach_common(struct comedi_device *dev)
s->insn_read = usbduxsigma_ai_insn_read;
s->do_cmdtest = usbduxsigma_ai_cmdtest;
s->do_cmd = usbduxsigma_ai_cmd;
s->cancel = usbdux_ai_cancel;
s->cancel = usbduxsigma_ai_cancel;
/* Analog Output subdevice */
s = &dev->subdevices[1];
......@@ -1448,7 +1448,7 @@ static int usbduxsigma_attach_common(struct comedi_device *dev)
s->insn_read = usbduxsigma_ao_insn_read;
s->do_cmdtest = usbduxsigma_ao_cmdtest;
s->do_cmd = usbduxsigma_ao_cmd;
s->cancel = usbdux_ao_cancel;
s->cancel = usbduxsigma_ao_cancel;
/* Digital I/O subdevice */
s = &dev->subdevices[2];
......
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