From: H Hartley Sweeten <hartleys@xxxxxxxxxxxxxxxxxxx>
For aesthetics, rename this function so it has namespace associated
with the driver.
Also, remove the unnecessary forward declaration.
Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/gsc_hpdi.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index 1fc65b1..f4cfac0 100644
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -52,8 +52,6 @@
#include "plx9080.h"
#include "comedi_fc.h"
-static void abort_dma(struct comedi_device *dev, unsigned int channel);
-
#define TIMER_BASE 50 /* 20MHz master clock */
#define DMA_BUFFER_SIZE 0x10000
#define NUM_DMA_BUFFERS 4
@@ -341,7 +339,7 @@ static irqreturn_t handle_interrupt(int irq, void *d)
return IRQ_HANDLED;
}
-static void abort_dma(struct comedi_device *dev, unsigned int channel)
+static void gsc_hpdi_abort_dma(struct comedi_device *dev, unsigned int channel)
{
struct hpdi_private *devpriv = dev->private;
unsigned long flags;
@@ -363,7 +361,7 @@ static int gsc_hpdi_cancel(struct comedi_device *dev,
writel(0, devpriv->hpdi_iobase + INTERRUPT_CONTROL_REG);
- abort_dma(dev, 0);
+ gsc_hpdi_abort_dma(dev, 0);
return 0;
}
@@ -382,7 +380,7 @@ static int gsc_hpdi_cmd(struct comedi_device *dev,
hpdi_writel(dev, RX_FIFO_RESET_BIT, BOARD_CONTROL_REG);
- abort_dma(dev, 0);
+ gsc_hpdi_abort_dma(dev, 0);
devpriv->dma_desc_index = 0;
@@ -608,8 +606,8 @@ static void init_plx9080(struct comedi_device *dev)
disable_plx_interrupts(dev);
- abort_dma(dev, 0);
- abort_dma(dev, 1);
+ gsc_hpdi_abort_dma(dev, 0);
+ gsc_hpdi_abort_dma(dev, 1);
/* configure dma0 mode */
bits = 0;
--
1.8.5.2
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
