]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: gsc_hpdi: rename hpdi_cancel()
authorH Hartley Sweeten <hartleys@visionengravers.com>
Thu, 13 Mar 2014 21:16:16 +0000 (14:16 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Mar 2014 21:19:49 +0000 (14:19 -0700)
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>
drivers/staging/comedi/drivers/gsc_hpdi.c

index e3bb921ed25325687bd46bb82e6ed865e07ccf84..1fc65b147731a9621bad2a8f892f506c2e4070d9 100644 (file)
@@ -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);
 }