From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 13 Mar 2014 21:16:16 +0000 (-0700)
Subject: staging: comedi: gsc_hpdi: rename hpdi_cancel()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3547473931035c29e80499afc46d037ea26b75ef;p=linux-beck.git

staging: comedi: gsc_hpdi: rename hpdi_cancel()

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

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index e3bb921ed253..1fc65b147731 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);
 }