From be1c23dabca3ca47ecb801593eac9407435e2f2c Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 29 Oct 2012 16:57:52 -0700
Subject: [PATCH] --- yaml --- r: 337433 b: refs/heads/master c:
 189790cd83afa7570ab66588896dd048d679b76f h: refs/heads/master i:   337431:
 4e456c49054f9f121151558a660bbd84c2178225 v: v3

---
 [refs]                                        |  2 +-
 .../comedi/drivers/addi-data/APCI1710_Tor.c   | 24 ++++++++++++-------
 .../comedi/drivers/addi-data/APCI1710_Tor.h   | 24 -------------------
 3 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/[refs] b/[refs]
index c63f350e802d..56023eec35f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f459d3ef0a1c3b79107c5120cf04f2bc53af933d
+refs/heads/master: 189790cd83afa7570ab66588896dd048d679b76f
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
index 28322fbfc1d6..3594a0487f70 100644
--- a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
+++ b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
@@ -130,8 +130,10 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev,
-	struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev,
+					       struct comedi_subdevice *s,
+					       struct comedi_insn *insn,
+					       unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_ReturnValue = 0;
@@ -988,8 +990,10 @@ int i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev,
-	struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev,
+						       struct comedi_subdevice *s,
+						       struct comedi_insn *insn,
+						       unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_ReturnValue = 0;
@@ -1462,8 +1466,10 @@ int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev,
-	struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev,
+							  struct comedi_subdevice *s,
+							  struct comedi_insn *insn,
+							  unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_ReturnValue = 0;
@@ -1703,8 +1709,10 @@ int i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
 
-int i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device *dev,
-	struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
+static int i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device *dev,
+								  struct comedi_subdevice *s,
+								  struct comedi_insn *insn,
+								  unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_ReturnValue = 0;
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
index 537d4755132e..c6eb9d1ad3cc 100644
--- a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
+++ b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
@@ -31,27 +31,3 @@
 #define APCI1710_TOR_GETPROGRESSSTATUS	0
 #define APCI1710_TOR_GETCOUNTERVALUE	1
 #define APCI1710_TOR_READINTERRUPT	2
-
-/*
- * TOR_COUNTER INISIALISATION FUNCTION
- */
-int i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev,
-					struct comedi_subdevice *s,
-					struct comedi_insn *insn, unsigned int *data);
-
-int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev,
-						struct comedi_subdevice *s,
-						struct comedi_insn *insn,
-						unsigned int *data);
-
-int i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev,
-						   struct comedi_subdevice *s,
-						   struct comedi_insn *insn,
-						   unsigned int *data);
-/*
- * TOR_COUNTER READ FUNCTION
- */
-int i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device *dev,
-							   struct comedi_subdevice *s,
-							   struct comedi_insn *insn,
-							   unsigned int *data);