openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Rename these functions so they have 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>
This commit is contained in:
H Hartley Sweeten 2013-05-23 13:06:55 -07:00 committed by Greg Kroah-Hartman
parent 702cd2dd4e
commit cca5bf1065
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/comedi/drivers/usbduxsigma.c
View File

@ -227,7 +227,7 @@ static void usbdux_ai_stop(struct usbduxsigma_private *devpriv, int do_unlink)
devpriv->ai_cmd_running = 0; 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 comedi_subdevice *s)
{ {
struct usbduxsigma_private *devpriv = dev->private; 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; 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 comedi_subdevice *s)
{ {
struct usbduxsigma_private *devpriv = dev->private; 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->insn_read = usbduxsigma_ai_insn_read;
s->do_cmdtest = usbduxsigma_ai_cmdtest; s->do_cmdtest = usbduxsigma_ai_cmdtest;
s->do_cmd = usbduxsigma_ai_cmd; s->do_cmd = usbduxsigma_ai_cmd;
s->cancel = usbdux_ai_cancel; s->cancel = usbduxsigma_ai_cancel;
/* Analog Output subdevice */ /* Analog Output subdevice */
s = &dev->subdevices[1]; 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->insn_read = usbduxsigma_ao_insn_read;
s->do_cmdtest = usbduxsigma_ao_cmdtest; s->do_cmdtest = usbduxsigma_ao_cmdtest;
s->do_cmd = usbduxsigma_ao_cmd; s->do_cmd = usbduxsigma_ao_cmd;
s->cancel = usbdux_ao_cancel; s->cancel = usbduxsigma_ao_cancel;
/* Digital I/O subdevice */ /* Digital I/O subdevice */
s = &dev->subdevices[2]; s = &dev->subdevices[2];