aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-06-18 16:27:19 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-24 18:51:05 -0400
commit5c1f62a75ca29d91606fd6e8bdeb2cff88086e0f (patch)
treec229f738de982feabff9d412b32a2479420df39f
parentee81b210fe9f761a3d34f6c061c67e6313df06bc (diff)
staging: comedi: pcmuio: fix namespace for all private functions
Rename a couple private functions so they have the same namespace as 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>
-rw-r--r--drivers/staging/comedi/drivers/pcmuio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index bc969d24d1a3..c43b6334ceae 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -257,7 +257,7 @@ static int pcmuio_dio_insn_config(struct comedi_device *dev,
257 return insn->n; 257 return insn->n;
258} 258}
259 259
260static void init_asics(struct comedi_device *dev) 260static void pcmuio_reset(struct comedi_device *dev)
261{ 261{
262 const struct pcmuio_board *board = comedi_board(dev); 262 const struct pcmuio_board *board = comedi_board(dev);
263 int asic; 263 int asic;
@@ -393,7 +393,7 @@ static int pcmuio_handle_asic_interrupt(struct comedi_device *dev, int asic)
393 return got1; 393 return got1;
394} 394}
395 395
396static irqreturn_t interrupt_pcmuio(int irq, void *d) 396static irqreturn_t pcmuio_interrupt(int irq, void *d)
397{ 397{
398 struct comedi_device *dev = d; 398 struct comedi_device *dev = d;
399 struct pcmuio_private *devpriv = dev->private; 399 struct pcmuio_private *devpriv = dev->private;
@@ -655,11 +655,11 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
655 spin_lock_init(&subpriv->intr.spinlock); 655 spin_lock_init(&subpriv->intr.spinlock);
656 } 656 }
657 657
658 init_asics(dev); /* clear out all the registers, basically */ 658 pcmuio_reset(dev);
659 659
660 for (asic = 0; irq[0] && asic < PCMUIO_MAX_ASICS; ++asic) { 660 for (asic = 0; irq[0] && asic < PCMUIO_MAX_ASICS; ++asic) {
661 if (irq[asic] 661 if (irq[asic]
662 && request_irq(irq[asic], interrupt_pcmuio, 662 && request_irq(irq[asic], pcmuio_interrupt,
663 IRQF_SHARED, board->name, dev)) { 663 IRQF_SHARED, board->name, dev)) {
664 int i; 664 int i;
665 /* unroll the allocated irqs.. */ 665 /* unroll the allocated irqs.. */