From: H Hartley Sweeten <hartl...@visionengravers.com>

For aesthetics, rename this function so it has namespace associated
with the driver.

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/gsc_hpdi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c 
b/drivers/staging/comedi/drivers/gsc_hpdi.c
index e3bb921..1fc65b1 100644
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -354,7 +354,8 @@ static void abort_dma(struct comedi_device *dev, unsigned 
int channel)
        spin_unlock_irqrestore(&dev->spinlock, flags);
 }
 
-static int hpdi_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
+static int gsc_hpdi_cancel(struct comedi_device *dev,
+                          struct comedi_subdevice *s)
 {
        struct hpdi_private *devpriv = dev->private;
 
@@ -729,7 +730,7 @@ static int hpdi_auto_attach(struct comedi_device *dev,
        s->insn_config  = gsc_hpdi_dio_insn_config;
        s->do_cmd       = gsc_hpdi_cmd;
        s->do_cmdtest   = gsc_hpdi_cmd_test;
-       s->cancel       = hpdi_cancel;
+       s->cancel       = gsc_hpdi_cancel;
 
        return init_hpdi(dev);
 }
-- 
1.8.5.2

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to