Staging: comedi: addi-data: Fix long CamelCase function names

This patch fixes a few function names that are very long and are not in the correct naming style Signed-off-by: Fred Akers <knivey@botops.net> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Staging: comedi: addi-data: Fix long CamelCase function names
This patch fixes a few function names that are very long and are not in the correct naming style Signed-off-by: Fred Akers <knivey@botops.net> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
805077b9 · Fred Akers · Greg Kroah-Hartman · 3e418b7c · 805077b9 · 805077b9
Commit 805077b9 authored Mar 11, 2014 by Fred Akers Committed by Greg Kroah-Hartman Mar 17, 2014
12 changed files
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
@@ -111,7 +111,7 @@ static int i_Temp;
 static int i_Flag = 1;
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ConfigTimerWatchdog                      |
+| Function   Name   : int apci035_timer_config                      |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -163,10 +163,10 @@ static int i_Flag = 1;
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev,
+static int apci035_timer_config(struct comedi_device *dev,
-					 struct comedi_subdevice *s,
+				struct comedi_subdevice *s,
-					 struct comedi_insn *insn,
+				struct comedi_insn *insn,
-					 unsigned int *data)
+				unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_Status;
@@ -287,7 +287,7 @@ static int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_StartStopWriteTimerWatchdog              |
+| Function   Name   : int apci035_timer_write              |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -312,10 +312,10 @@ static int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev,
 |					                                                 |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
+static int apci035_timer_write(struct comedi_device *dev,
-						 struct comedi_subdevice *s,
+			       struct comedi_subdevice *s,
-						 struct comedi_insn *insn,
+			       struct comedi_insn *insn,
-						 unsigned int *data)
+			       unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_Command;
@@ -402,7 +402,7 @@ static int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ReadTimerWatchdog                        |
+| Function   Name   : int apci035_timer_read                        |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -427,10 +427,10 @@ static int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev,
+static int apci035_timer_read(struct comedi_device *dev,
-				       struct comedi_subdevice *s,
+			      struct comedi_subdevice *s,
-				       struct comedi_insn *insn,
+			      struct comedi_insn *insn,
-				       unsigned int *data)
+			      unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_Status;	/*  Status register */
@@ -459,7 +459,7 @@ static int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ConfigAnalogInput                        |
+| Function   Name   : int apci035_ai_config                        |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -480,10 +480,10 @@ static int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_ConfigAnalogInput(struct comedi_device *dev,
+static int apci035_ai_config(struct comedi_device *dev,
-				       struct comedi_subdevice *s,
+			     struct comedi_subdevice *s,
-				       struct comedi_insn *insn,
+			     struct comedi_insn *insn,
-				       unsigned int *data)
+			     unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
@@ -501,7 +501,7 @@ static int i_APCI035_ConfigAnalogInput(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI035_ReadAnalogInput                          |
+| Function   Name   : int apci035_ai_read                          |
 |			          (struct comedi_device *dev,struct comedi_subdevice *s,       |
 |                     struct comedi_insn *insn,unsigned int *data)                      |
 +----------------------------------------------------------------------------+
@@ -520,10 +520,10 @@ static int i_APCI035_ConfigAnalogInput(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_ReadAnalogInput(struct comedi_device *dev,
+static int apci035_ai_read(struct comedi_device *dev,
-				     struct comedi_subdevice *s,
+			   struct comedi_subdevice *s,
-				     struct comedi_insn *insn,
+			   struct comedi_insn *insn,
-				     unsigned int *data)
+			   unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_CommandRegister;
@@ -541,7 +541,7 @@ static int i_APCI035_ReadAnalogInput(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   :  int i_APCI035_Reset(struct comedi_device *dev)			     |
+| Function   Name   :  int apci035_reset(struct comedi_device *dev)
 |					                                                         |
 +----------------------------------------------------------------------------+
 | Task              :Resets the registers of the card                        |
@@ -554,7 +554,7 @@ static int i_APCI035_ReadAnalogInput(struct comedi_device *dev,
 |			                                                                 |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI035_Reset(struct comedi_device *dev)
+static int apci035_reset(struct comedi_device *dev)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_Count;
@@ -572,7 +572,7 @@ static int i_APCI035_Reset(struct comedi_device *dev)
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : static void v_APCI035_Interrupt					     |
+| Function   Name   : static void apci035_interrupt
 |					  (int irq , void *d)      |
 +----------------------------------------------------------------------------+
 | Task              : Interrupt processing Routine                           |
@@ -587,7 +587,7 @@ static int i_APCI035_Reset(struct comedi_device *dev)
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static void v_APCI035_Interrupt(int irq, void *d)
+static void apci035_interrupt(int irq, void *d)
 {
 	struct comedi_device *dev = d;
 	struct addi_private *devpriv = dev->private;

--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
@@ -154,7 +154,7 @@ static int i_TimerCounter1Enabled, i_TimerCounter2Enabled,
 /*
  +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1500_ConfigDigitalInputEvent                 |
+  | Function   Name   : int apci1500_di_config                 |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -230,10 +230,10 @@ static int i_TimerCounter1Enabled, i_TimerCounter2Enabled,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+static int apci1500_di_config(struct comedi_device *dev,
-					      struct comedi_subdevice *s,
+			      struct comedi_subdevice *s,
-					      struct comedi_insn *insn,
+			      struct comedi_insn *insn,
-					      unsigned int *data)
+			      unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_PatternPolarity = 0, i_PatternTransition = 0, i_PatternMask = 0;
@@ -538,7 +538,7 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1500_StartStopInputEvent                     |
+| Function   Name   : int apci1500_di_write                     |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -558,10 +558,10 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
+static int apci1500_di_write(struct comedi_device *dev,
-					  struct comedi_subdevice *s,
+			     struct comedi_subdevice *s,
-					  struct comedi_insn *insn,
+			     struct comedi_insn *insn,
-					  unsigned int *data)
+			     unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_Event1InterruptStatus = 0, i_Event2InterruptStatus =
@@ -749,7 +749,7 @@ static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1500_Initialisation                          |
+| Function   Name   : int apci1500_di_read                          |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -766,10 +766,10 @@ static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1500_Initialisation(struct comedi_device *dev,
+static int apci1500_di_read(struct comedi_device *dev,
-				     struct comedi_subdevice *s,
+			    struct comedi_subdevice *s,
-				     struct comedi_insn *insn,
+			    struct comedi_insn *insn,
-				     unsigned int *data)
+			    unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_DummyRead = 0;
@@ -916,7 +916,7 @@ static int apci1500_di_insn_bits(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_apci1500_config_output
+| Function   Name   : int apci1500_do_config
 |                      (struct comedi_device *dev,struct comedi_subdevice *s struct comedi_insn
 |                      *insn,unsigned int *data)                                  |
 |				                                                     |
@@ -942,9 +942,10 @@ static int apci1500_di_insn_bits(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_acpi1500_config_output(struct comedi_device *dev,
+static int apci1500_do_config(struct comedi_device *dev,
-	struct comedi_subdevice *s, struct comedi_insn *insn,
+			      struct comedi_subdevice *s,
-	unsigned int *data)
+			      struct comedi_insn *insn,
+			      unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
@@ -954,7 +955,7 @@ static int i_acpi1500_config_output(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1500_WriteDigitalOutput                      |
+| Function   Name   : int apci1500_do_write                      |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -971,10 +972,10 @@ static int i_acpi1500_config_output(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,
+static int apci1500_do_write(struct comedi_device *dev,
-					 struct comedi_subdevice *s,
+			     struct comedi_subdevice *s,
-					 struct comedi_insn *insn,
+			     struct comedi_insn *insn,
-					 unsigned int *data)
+			     unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	static unsigned int ui_Temp;
@@ -1125,7 +1126,7 @@ static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device
+| Function   Name   : int apci1500_timer_config(comedi_device
 |                   *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)|
 |				                                                     |
 +----------------------------------------------------------------------------+
@@ -1171,10 +1172,10 @@ static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+static int apci1500_timer_config(struct comedi_device *dev,
-						 struct comedi_subdevice *s,
+				 struct comedi_subdevice *s,
-						 struct comedi_insn *insn,
+				 struct comedi_insn *insn,
-						 unsigned int *data)
+				 unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_TimerCounterMode, i_MasterConfiguration;
@@ -1663,7 +1664,7 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_apci1500_timer_watchdog
+| Function   Name   : int apci1500_timer_write
 |				(struct comedi_device *dev,struct comedi_subdevice *s,
 |                         struct comedi_insn *insn,unsigned int *data);                  |
 +----------------------------------------------------------------------------+
@@ -1689,9 +1690,10 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+static int apci1500_timer_write(struct comedi_device *dev,
-	struct comedi_subdevice *s, struct comedi_insn *insn,
+				struct comedi_subdevice *s,
-	unsigned int *data)
+				struct comedi_insn *insn,
+				unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_CommandAndStatusValue;
@@ -1958,7 +1960,7 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1500_ReadCounterTimerWatchdog                |
+| Function   Name   : int apci1500_timer_bits                |
 |			(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
 |                    unsigned int *data); 	                                     |
 +----------------------------------------------------------------------------+
@@ -1980,10 +1982,10 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
+static int apci1500_timer_bits(struct comedi_device *dev,
-					       struct comedi_subdevice *s,
+			       struct comedi_subdevice *s,
-					       struct comedi_insn *insn,
+			       struct comedi_insn *insn,
-					       unsigned int *data)
+			       unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_CommandAndStatusValue;
@@ -2132,7 +2134,7 @@ static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int  i_APCI1500_ReadInterruptMask                      |
+| Function   Name   : int  apci1500_timer_read                      |
 |			(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
 |                    unsigned int *data); 	                                     |
 +----------------------------------------------------------------------------+
@@ -2152,10 +2154,10 @@ static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1500_ReadInterruptMask(struct comedi_device *dev,
+static int apci1500_timer_read(struct comedi_device *dev,
-					struct comedi_subdevice *s,
+			       struct comedi_subdevice *s,
-					struct comedi_insn *insn,
+			       struct comedi_insn *insn,
-					unsigned int *data)
+			       unsigned int *data)
 {
 	data[0] = i_InterruptMask;
 	data[1] = i_InputChannel;
@@ -2165,7 +2167,7 @@ static int i_APCI1500_ReadInterruptMask(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int  i_APCI1500_ConfigureInterrupt                     |
+| Function   Name   : int  apci1500_do_bits                     |
 |			(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
 |                    unsigned int *data); 	                                     |
 +----------------------------------------------------------------------------+
@@ -2185,10 +2187,10 @@ static int i_APCI1500_ReadInterruptMask(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev,
+static int apci1500_do_bits(struct comedi_device *dev,
-					 struct comedi_subdevice *s,
+			    struct comedi_subdevice *s,
-					 struct comedi_insn *insn,
+			    struct comedi_insn *insn,
-					 unsigned int *data)
+			    unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_Status;
@@ -2310,7 +2312,7 @@ static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : static void v_APCI1500_Interrupt					     |
+| Function   Name   : static void apci1500_interrupt
 |					  (int irq , void *d)      |
 +----------------------------------------------------------------------------+
 | Task              : Interrupt handler                                      |
@@ -2325,7 +2327,7 @@ static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static void v_APCI1500_Interrupt(int irq, void *d)
+static void apci1500_interrupt(int irq, void *d)
 {
 	struct comedi_device *dev = d;
@@ -2505,7 +2507,7 @@ static void v_APCI1500_Interrupt(int irq, void *d)
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1500_Reset(struct comedi_device *dev)               |                                                       |
+| Function   Name   : int apci1500_reset(struct comedi_device *dev)
 +----------------------------------------------------------------------------+
 | Task              :resets all the registers                                |
 +----------------------------------------------------------------------------+
@@ -2517,7 +2519,7 @@ static void v_APCI1500_Interrupt(int irq, void *d)
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1500_Reset(struct comedi_device *dev)
+static int apci1500_reset(struct comedi_device *dev)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_DummyRead = 0;

--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
@@ -116,7 +116,7 @@ static unsigned int ui_InterruptData, ui_Type;
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_ConfigDigitalInput                      |
+| Function   Name   : int apci1564_di_config                      |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -141,10 +141,10 @@ static unsigned int ui_InterruptData, ui_Type;
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1564_ConfigDigitalInput(struct comedi_device *dev,
+static int apci1564_di_config(struct comedi_device *dev,
-					 struct comedi_subdevice *s,
+			      struct comedi_subdevice *s,
-					 struct comedi_insn *insn,
+			      struct comedi_insn *insn,
-					 unsigned int *data)
+			      unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
@@ -183,7 +183,7 @@ static int apci1564_di_insn_bits(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_ConfigDigitalOutput                     |
+| Function   Name   : int apci1564_do_config                     |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -206,10 +206,10 @@ static int apci1564_di_insn_bits(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev,
+static int apci1564_do_config(struct comedi_device *dev,
-					  struct comedi_subdevice *s,
+			      struct comedi_subdevice *s,
-					  struct comedi_insn *insn,
+			      struct comedi_insn *insn,
-					  unsigned int *data)
+			      unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ul_Command = 0;
@@ -260,7 +260,7 @@ static int apci1564_do_insn_bits(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_ConfigTimerCounterWatchdog              |
+| Function   Name   : int apci1564_timer_config              |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -288,10 +288,10 @@ static int apci1564_do_insn_bits(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
+static int apci1564_timer_config(struct comedi_device *dev,
-						 struct comedi_subdevice *s,
+				 struct comedi_subdevice *s,
-						 struct comedi_insn *insn,
+				 struct comedi_insn *insn,
-						 unsigned int *data)
+				 unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ul_Command1 = 0;
@@ -383,7 +383,7 @@ static int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_StartStopWriteTimerCounterWatchdog      |
+| Function   Name   : int apci1564_timer_write      |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -407,10 +407,10 @@ static int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
+static int apci1564_timer_write(struct comedi_device *dev,
-							 struct comedi_subdevice *s,
+				struct comedi_subdevice *s,
-							 struct comedi_insn *insn,
+				struct comedi_insn *insn,
-							 unsigned int *data)
+				unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ul_Command1 = 0;
@@ -471,7 +471,7 @@ static int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *d
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_ReadTimerCounterWatchdog                |
+| Function   Name   : int apci1564_timer_read                |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -490,10 +490,10 @@ static int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *d
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
+static int apci1564_timer_read(struct comedi_device *dev,
-					       struct comedi_subdevice *s,
+			       struct comedi_subdevice *s,
-					       struct comedi_insn *insn,
+			       struct comedi_insn *insn,
-					       unsigned int *data)
+			       unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ul_Command1 = 0;
@@ -538,7 +538,7 @@ static int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   :  int i_APCI1564_ReadInterruptStatus                    |
+| Function   Name   :  int apci1564_do_read                    |
 |			  (struct comedi_device *dev,struct comedi_subdevice *s,               |
 |                      struct comedi_insn *insn,unsigned int *data)                     |
 +----------------------------------------------------------------------------+
@@ -553,10 +553,10 @@ static int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev,
+static int apci1564_do_read(struct comedi_device *dev,
-					  struct comedi_subdevice *s,
+			    struct comedi_subdevice *s,
-					  struct comedi_insn *insn,
+			    struct comedi_insn *insn,
-					  unsigned int *data)
+			    unsigned int *data)
 {
 	*data = ui_Type;
 	return insn->n;
@@ -564,7 +564,7 @@ static int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev,
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : static void v_APCI1564_Interrupt					     |
+| Function   Name   : static void apci1564_interrupt
 |					  (int irq , void *d)      |
 +----------------------------------------------------------------------------+
 | Task              : Interrupt handler for the interruptible digital inputs |
@@ -579,7 +579,7 @@ static int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev,
 |			                                                         |
 +----------------------------------------------------------------------------+
 */
-static void v_APCI1564_Interrupt(int irq, void *d)
+static void apci1564_interrupt(int irq, void *d)
 {
 	struct comedi_device *dev = d;
 	struct addi_private *devpriv = dev->private;
@@ -726,7 +726,7 @@ static void v_APCI1564_Interrupt(int irq, void *d)
 /*
 +----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1564_Reset(struct comedi_device *dev)               |                                                       |
+| Function   Name   : int apci1564_reset(struct comedi_device *dev)
 +----------------------------------------------------------------------------+
 | Task              :resets all the registers                                |
 +----------------------------------------------------------------------------+
@@ -739,7 +739,7 @@ static void v_APCI1564_Interrupt(int irq, void *d)
 +----------------------------------------------------------------------------+
 */
-static int i_APCI1564_Reset(struct comedi_device *dev)
+static int apci1564_reset(struct comedi_device *dev)
 {
 	struct addi_private *devpriv = dev->private;

--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -248,10 +248,10 @@ static const struct comedi_lrange range_apci3120_ao = {
 +----------------------------------------------------------------------------+
 */
-static int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev,
+static int apci3120_ai_insn_config(struct comedi_device *dev,
-					    struct comedi_subdevice *s,
+				   struct comedi_subdevice *s,
-					    struct comedi_insn *insn,
+				   struct comedi_insn *insn,
-					    unsigned int *data)
+				   unsigned int *data)
 {
 	const struct addi_board *this_board = comedi_board(dev);
 	struct addi_private *devpriv = dev->private;
@@ -304,11 +304,11 @@ static int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev,
 * If the last argument of function "check"is 1 then it only checks
 * the channel list is ok or not.
 */
-static int i_APCI3120_SetupChannelList(struct comedi_device *dev,
+static int apci3120_setup_chan_list(struct comedi_device *dev,
-				       struct comedi_subdevice *s,
+				    struct comedi_subdevice *s,
-				       int n_chan,
+				    int n_chan,
-				       unsigned int *chanlist,
+				    unsigned int *chanlist,
-				       char check)
+				    char check)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int i;		/* , differencial=0, bipolar=0; */
@@ -358,10 +358,10 @@ static int i_APCI3120_SetupChannelList(struct comedi_device *dev,
 * as per configured if no conversion time is set uses default
 * conversion time 10 microsec.
 */
-static int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev,
+static int apci3120_ai_insn_read(struct comedi_device *dev,
-					  struct comedi_subdevice *s,
+				 struct comedi_subdevice *s,
-					  struct comedi_insn *insn,
+				 struct comedi_insn *insn,
-					  unsigned int *data)
+				 unsigned int *data)
 {
 	const struct addi_board *this_board = comedi_board(dev);
 	struct addi_private *devpriv = dev->private;
@@ -417,10 +417,7 @@ static int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev,
 			inw(devpriv->iobase + APCI3120_RESET_FIFO);
 			/*  Initialize the sequence array */
+			if (!apci3120_setup_chan_list(dev, s, 1,
-			/* if (!i_APCI3120_SetupChannelList(dev,s,1,chanlist,0))  return -EINVAL; */
-			if (!i_APCI3120_SetupChannelList(dev, s, 1,
 					&insn->chanspec, 0))
 				return -EINVAL;
@@ -512,7 +509,7 @@ static int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev,
 			outw(devpriv->us_OutputRegister,
 				devpriv->iobase + APCI3120_WR_ADDRESS);
-			if (!i_APCI3120_SetupChannelList(dev, s,
+			if (!apci3120_setup_chan_list(dev, s,
 					devpriv->ui_AiNbrofChannels,
 					devpriv->ui_AiChannelList, 0))
 				return -EINVAL;
@@ -606,7 +603,7 @@ static int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev,
 }
-static int i_APCI3120_Reset(struct comedi_device *dev)
+static int apci3120_reset(struct comedi_device *dev)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int i;
@@ -663,7 +660,7 @@ static int i_APCI3120_Reset(struct comedi_device *dev)
 	return 0;
 }
-static int i_APCI3120_ExttrigEnable(struct comedi_device *dev)
+static int apci3120_exttrig_enable(struct comedi_device *dev)
 {
 	struct addi_private *devpriv = dev->private;
@@ -672,7 +669,7 @@ static int i_APCI3120_ExttrigEnable(struct comedi_device *dev)
 	return 0;
 }
-static int i_APCI3120_ExttrigDisable(struct comedi_device *dev)
+static int apci3120_exttrig_disable(struct comedi_device *dev)
 {
 	struct addi_private *devpriv = dev->private;
@@ -681,8 +678,8 @@ static int i_APCI3120_ExttrigDisable(struct comedi_device *dev)
 	return 0;
 }
-static int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev,
+static int apci3120_cancel(struct comedi_device *dev,
-					    struct comedi_subdevice *s)
+			   struct comedi_subdevice *s)
 {
 	struct addi_private *devpriv = dev->private;
@@ -705,7 +702,7 @@ static int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev,
 	 * devpriv->i_IobaseAmcc+AMCC_OP_REG_MCSR);  stop DMA */
 	/* Disable ext trigger */
-	i_APCI3120_ExttrigDisable(dev);
+	apci3120_exttrig_disable(dev);
 	devpriv->us_OutputRegister = 0;
 	/* stop  counters */
@@ -729,13 +726,13 @@ static int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev,
 	devpriv->b_AiCyclicAcquisition = APCI3120_DISABLE;
 	devpriv->b_InterruptMode = APCI3120_EOC_MODE;
 	devpriv->b_EocEosInterrupt = APCI3120_DISABLE;
-	i_APCI3120_Reset(dev);
+	apci3120_reset(dev);
 	return 0;
 }
-static int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev,
+static int apci3120_ai_cmdtest(struct comedi_device *dev,
-					     struct comedi_subdevice *s,
+			       struct comedi_subdevice *s,
-					     struct comedi_cmd *cmd)
+			       struct comedi_cmd *cmd)
 {
 	const struct addi_board *this_board = comedi_board(dev);
 	int err = 0;
@@ -818,9 +815,9 @@ static int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev,
 * If DMA is configured does DMA initialization otherwise does the
 * acquisition with EOS interrupt.
 */
-static int i_APCI3120_CyclicAnalogInput(int mode,
+static int apci3120_cyclic_ai(int mode,
-					struct comedi_device *dev,
+			      struct comedi_device *dev,
-					struct comedi_subdevice *s)
+			      struct comedi_subdevice *s)
 {
 	const struct addi_board *this_board = comedi_board(dev);
 	struct addi_private *devpriv = dev->private;
@@ -904,7 +901,7 @@ static int i_APCI3120_CyclicAnalogInput(int mode,
   /**********************************/
 	/* Initializes the sequence array */
   /**********************************/
-	if (!i_APCI3120_SetupChannelList(dev, s, devpriv->ui_AiNbrofChannels,
+	if (!apci3120_setup_chan_list(dev, s, devpriv->ui_AiNbrofChannels,
 			devpriv->pui_AiChannelList, 0))
 		return -EINVAL;
@@ -957,7 +954,7 @@ static int i_APCI3120_CyclicAnalogInput(int mode,
 /*** EL241003 End ******************************************************************************/
 	if (devpriv->b_ExttrigEnable == APCI3120_ENABLE)
-		i_APCI3120_ExttrigEnable(dev);	/*  activate EXT trigger */
+		apci3120_exttrig_enable(dev);	/*  activate EXT trigger */
 	switch (mode) {
 	case 1:
 		/*  init timer0 in mode 2 */
@@ -1333,8 +1330,8 @@ static int i_APCI3120_CyclicAnalogInput(int mode,
 * Does asynchronous acquisition.
 * Determines the mode 1 or 2.
 */
-static int i_APCI3120_CommandAnalogInput(struct comedi_device *dev,
+static int apci3120_ai_cmd(struct comedi_device *dev,
-					 struct comedi_subdevice *s)
+			   struct comedi_subdevice *s)
 {
 	struct addi_private *devpriv = dev->private;
 	struct comedi_cmd *cmd = &s->async->cmd;
@@ -1371,7 +1368,7 @@ static int i_APCI3120_CommandAnalogInput(struct comedi_device *dev,
 			devpriv->ui_AiTimer0 = cmd->convert_arg;	/*  timer constant in nano seconds */
 			/* return this_board->ai_cmd(1,dev,s); */
-			return i_APCI3120_CyclicAnalogInput(1, dev, s);
+			return apci3120_cyclic_ai(1, dev, s);
 		}
 	}
@@ -1381,7 +1378,7 @@ static int i_APCI3120_CommandAnalogInput(struct comedi_device *dev,
 		devpriv->ui_AiTimer1 = cmd->scan_begin_arg;
 		devpriv->ui_AiTimer0 = cmd->convert_arg;	/*  variable changed timer2 to timer0 */
 		/* return this_board->ai_cmd(2,dev,s); */
-		return i_APCI3120_CyclicAnalogInput(2, dev, s);
+		return apci3120_cyclic_ai(2, dev, s);
 	}
 	return -1;
 }
@@ -1410,7 +1407,7 @@ static void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,
 * For continuous DMA it reinitializes the DMA operation.
 * For single mode DMA it stop the acquisition.
 */
-static void v_APCI3120_InterruptDma(int irq, void *d)
+static void apci3120_interrupt_dma(int irq, void *d)
 {
 	struct comedi_device *dev = d;
 	struct addi_private *devpriv = dev->private;
@@ -1429,7 +1426,7 @@ static void v_APCI3120_InterruptDma(int irq, void *d)
 	}
 	if (samplesinbuf & 1) {
 		comedi_error(dev, "Odd count of bytes in DMA ring!");
-		i_APCI3120_StopCyclicAcquisition(dev, s);
+		apci3120_cancel(dev, s);
 		devpriv->b_AiCyclicAcquisition = APCI3120_DISABLE;
 		return;
@@ -1500,7 +1497,7 @@ static void v_APCI3120_InterruptDma(int irq, void *d)
 	if (!devpriv->b_AiContinuous)
 		if (devpriv->ui_AiActualScan >= devpriv->ui_AiNbrofScans) {
 			/*  all data sampled */
-			i_APCI3120_StopCyclicAcquisition(dev, s);
+			apci3120_cancel(dev, s);
 			devpriv->b_AiCyclicAcquisition = APCI3120_DISABLE;
 			s->async->events |= COMEDI_CB_EOA;
 			comedi_event(dev, s);
@@ -1565,7 +1562,7 @@ static void v_APCI3120_InterruptDma(int irq, void *d)
 * This function handles EOS interrupt.
 * This function copies the acquired data(from FIFO) to Comedi buffer.
 */
-static int i_APCI3120_InterruptHandleEos(struct comedi_device *dev)
+static int apci3120_interrupt_handle_eos(struct comedi_device *dev)
 {
 	struct addi_private *devpriv = dev->private;
 	struct comedi_subdevice *s = dev->read_subdev;
@@ -1587,7 +1584,7 @@ static int i_APCI3120_InterruptHandleEos(struct comedi_device *dev)
 	return 0;
 }
-static void v_APCI3120_Interrupt(int irq, void *d)
+static void apci3120_interrupt(int irq, void *d)
 {
 	struct comedi_device *dev = d;
 	struct addi_private *devpriv = dev->private;
@@ -1613,7 +1610,7 @@ static void v_APCI3120_Interrupt(int irq, void *d)
 	if (devpriv->b_ExttrigEnable == APCI3120_ENABLE) {
 		/* Disable ext trigger */
-		i_APCI3120_ExttrigDisable(dev);
+		apci3120_exttrig_disable(dev);
 		devpriv->b_ExttrigEnable = APCI3120_DISABLE;
 	}
 	/* clear the timer 2 interrupt */
@@ -1653,7 +1650,7 @@ static void v_APCI3120_Interrupt(int irq, void *d)
 			if (devpriv->b_AiCyclicAcquisition == APCI3120_ENABLE) {
 				ui_Check = 0;
-				i_APCI3120_InterruptHandleEos(dev);
+				apci3120_interrupt_handle_eos(dev);
 				devpriv->ui_AiActualScan++;
 				devpriv->b_ModeSelectRegister =
 					devpriv->
@@ -1709,7 +1706,7 @@ static void v_APCI3120_Interrupt(int irq, void *d)
 				dev->iobase + APCI3120_WR_ADDRESS);
 			/* stop timer 0 and timer 1 */
-			i_APCI3120_StopCyclicAcquisition(dev, s);
+			apci3120_cancel(dev, s);
 			devpriv->b_AiCyclicAcquisition = APCI3120_DISABLE;
 			/* UPDATE-0.7.57->0.7.68comedi_done(dev,s); */
@@ -1763,7 +1760,8 @@ static void v_APCI3120_Interrupt(int irq, void *d)
 			/* Clears the timer status register */
 			/************************************/
 			inw(dev->iobase + APCI3120_TIMER_STATUS_REGISTER);
-			v_APCI3120_InterruptDma(irq, d);	/*  do some data transfer */
+			/* do some data transfer */
+			apci3120_interrupt_dma(irq, d);
 		} else {
 			/* Stops the Timer */
 			outw(devpriv->
@@ -1785,7 +1783,7 @@ static void v_APCI3120_Interrupt(int irq, void *d)
 * data[1] = Timer constant
 * data[2] = Timer2 interrupt (1)enable or(0) disable
 */
-static int i_APCI3120_InsnConfigTimer(struct comedi_device *dev,
+static int apci3120_config_insn_timer(struct comedi_device *dev,
 				      struct comedi_subdevice *s,
 				      struct comedi_insn *insn,
 				      unsigned int *data)
@@ -1930,7 +1928,7 @@ static int i_APCI3120_InsnConfigTimer(struct comedi_device *dev,
 *			 = 1 Timer
 *			 = 2 Watch dog
 */
-static int i_APCI3120_InsnWriteTimer(struct comedi_device *dev,
+static int apci3120_write_insn_timer(struct comedi_device *dev,
 				     struct comedi_subdevice *s,
 				     struct comedi_insn *insn,
 				     unsigned int *data)
@@ -2102,7 +2100,7 @@ static int i_APCI3120_InsnWriteTimer(struct comedi_device *dev,
 * for watchdog: data[0] = 0 (still running)
 *			 = 1 (run down)
 */
-static int i_APCI3120_InsnReadTimer(struct comedi_device *dev,
+static int apci3120_read_insn_timer(struct comedi_device *dev,
 				    struct comedi_subdevice *s,
 				    struct comedi_insn *insn,
 				    unsigned int *data)
@@ -2187,10 +2185,10 @@ static int apci3120_do_insn_bits(struct comedi_device *dev,
 	return insn->n;
 }
-static int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev,
+static int apci3120_ao_insn_write(struct comedi_device *dev,
-					    struct comedi_subdevice *s,
+				  struct comedi_subdevice *s,
-					    struct comedi_insn *insn,
+				  struct comedi_insn *insn,
-					    unsigned int *data)
+				  unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_Range, ui_Channel;

--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
@@ -1268,7 +1268,7 @@ static int i_APCI3200_ReadCJCCalGain(struct comedi_device *dev,
 	return 0;
 }
-static int i_APCI3200_Reset(struct comedi_device *dev)
+static int apci3200_reset(struct comedi_device *dev)
 {
 	struct addi_private *devpriv = dev->private;
 	int i_Temp;
@@ -1322,10 +1322,10 @@ static int i_APCI3200_Reset(struct comedi_device *dev)
 * data[7] : Channel current source from eeprom
 * data[8] : Channle gain factor from eeprom
 */
-static int i_APCI3200_ReadAnalogInput(struct comedi_device *dev,
+static int apci3200_ai_read(struct comedi_device *dev,
-				      struct comedi_subdevice *s,
+			    struct comedi_subdevice *s,
-				      struct comedi_insn *insn,
+			    struct comedi_insn *insn,
-				      unsigned int *data)
+			    unsigned int *data)
 {
 	unsigned int ui_DummyValue = 0;
 	int i_ConvertCJCCalibration;
@@ -1336,7 +1336,7 @@ static int i_APCI3200_ReadAnalogInput(struct comedi_device *dev,
 	if (s_BoardInfos[dev->minor].i_Initialised == 0)
 		/* END JK 06.07.04: Management of sevrals boards */
 	{
-		i_APCI3200_Reset(dev);
+		apci3200_reset(dev);
 		return -EINVAL;
 	}			/* if(i_Initialised==0); */
@@ -1586,7 +1586,7 @@ static int i_APCI3200_ReadAnalogInput(struct comedi_device *dev,
 		break;
 	default:
 		printk("\nThe parameters passed are in error\n");
-		i_APCI3200_Reset(dev);
+		apci3200_reset(dev);
 		return -EINVAL;
 	}			/* switch(insn->unused[0]) */
@@ -1626,10 +1626,10 @@ static int i_APCI3200_ReadAnalogInput(struct comedi_device *dev,
 *	    = 2  RTD 3 wire connection
 *	    = 3  RTD 4 wire connection
 */
-static int i_APCI3200_ConfigAnalogInput(struct comedi_device *dev,
+static int apci3200_ai_config(struct comedi_device *dev,
-					struct comedi_subdevice *s,
+			      struct comedi_subdevice *s,
-					struct comedi_insn *insn,
+			      struct comedi_insn *insn,
-					unsigned int *data)
+			      unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ul_Config = 0, ul_Temp = 0;
@@ -1970,7 +1970,7 @@ static int i_APCI3200_ConfigAnalogInput(struct comedi_device *dev,
 		}		/*  switch(data[11]) */
 	}			/*  elseif(data[12]==0 || data[12]==1) */
 	if (i_err) {
-		i_APCI3200_Reset(dev);
+		apci3200_reset(dev);
 		return -EINVAL;
 	}
 	/* if(i_ScanType!=1) */
@@ -2079,7 +2079,7 @@ static int i_APCI3200_ConfigAnalogInput(struct comedi_device *dev,
 		/* END JK 06.07.04: Management of sevrals boards */
 		insn->unused[0] = 0;
-		i_APCI3200_ReadAnalogInput(dev, s, insn, &ui_Dummy);
+		apci3200_ai_read(dev, s, insn, &ui_Dummy);
 	}
 	return insn->n;
@@ -2095,10 +2095,10 @@ static int i_APCI3200_ConfigAnalogInput(struct comedi_device *dev,
 * data[1] : calibration offset
 * data[2] : calibration gain
 */
-static int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device *dev,
+static int apci3200_ai_bits_test(struct comedi_device *dev,
-						struct comedi_subdevice *s,
+				 struct comedi_subdevice *s,
-						struct comedi_insn *insn,
+				 struct comedi_insn *insn,
-						unsigned int *data)
+				 unsigned int *data)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_Configuration = 0;
@@ -2107,12 +2107,12 @@ static int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device *dev,
 	/* if(i_Initialised==0) */
 	if (s_BoardInfos[dev->minor].i_Initialised == 0) {
-		i_APCI3200_Reset(dev);
+		apci3200_reset(dev);
 		return -EINVAL;
 	}			/* if(i_Initialised==0); */
 	if (data[0] != 0 && data[0] != 1) {
 		printk("\nError in selection of functionality\n");
-		i_APCI3200_Reset(dev);
+		apci3200_reset(dev);
 		return -EINVAL;
 	}			/* if(data[0]!=0 && data[0]!=1) */
@@ -2202,18 +2202,18 @@ static int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device *dev,
 	return insn->n;
 }
-static int i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device *dev,
+static int apci3200_ai_write(struct comedi_device *dev,
-						  struct comedi_subdevice *s,
+			     struct comedi_subdevice *s,
-						  struct comedi_insn *insn,
+			     struct comedi_insn *insn,
-						  unsigned int *data)
+			     unsigned int *data)
 {
-	i_APCI3200_Reset(dev);
+	apci3200_reset(dev);
 	return insn->n;
 }
-static int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev,
+static int apci3200_ai_cmdtest(struct comedi_device *dev,
-					     struct comedi_subdevice *s,
+			       struct comedi_subdevice *s,
-					     struct comedi_cmd *cmd)
+			       struct comedi_cmd *cmd)
 {
 	int err = 0;
@@ -2241,7 +2241,7 @@ static int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev,
 		err |= -EINVAL;
 	if (err) {
-		i_APCI3200_Reset(dev);
+		apci3200_reset(dev);
 		return 1;
 	}
@@ -2267,7 +2267,7 @@ static int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev,
 	}
 	if (err) {
-		i_APCI3200_Reset(dev);
+		apci3200_reset(dev);
 		return 2;
 	}
 	/* i_FirstChannel=cmd->chanlist[0]; */
@@ -2308,7 +2308,7 @@ static int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev,
 			printk("\nThe Delay time value is in error\n");
 		}
 		if (err) {
-			i_APCI3200_Reset(dev);
+			apci3200_reset(dev);
 			return 3;
 		}
 		fpu_begin();
@@ -2366,15 +2366,15 @@ static int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev,
 	}			/* else if(cmd->scan_begin_src==TRIG_FOLLOW) */
 	if (err) {
-		i_APCI3200_Reset(dev);
+		apci3200_reset(dev);
 		return 4;
 	}
 	return 0;
 }
-static int i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev,
+static int apci3200_cancel(struct comedi_device *dev,
-					    struct comedi_subdevice *s)
+			   struct comedi_subdevice *s)
 {
 	struct addi_private *devpriv = dev->private;
 	unsigned int ui_Configuration = 0;
@@ -2410,8 +2410,8 @@ static int i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev,
 * Does asynchronous acquisition
 * Determines the mode 1 or 2.
 */
-static int i_APCI3200_CommandAnalogInput(struct comedi_device *dev,
+static int apci3200_ai_cmd(struct comedi_device *dev,
-					 struct comedi_subdevice *s)
+			   struct comedi_subdevice *s)
 {
 	struct addi_private *devpriv = dev->private;
 	struct comedi_cmd *cmd = &s->async->cmd;
@@ -2729,7 +2729,7 @@ static int i_APCI3200_InterruptHandleEos(struct comedi_device *dev)
 	return 0;
 }
-static void v_APCI3200_Interrupt(int irq, void *d)
+static void apci3200_interrupt(int irq, void *d)
 {
 	struct comedi_device *dev = d;
 	struct addi_private *devpriv = dev->private;

--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
@@ -16,10 +16,10 @@
 *	data[2] : Time Unit
 *	data[3] : Reload Value
 */
-static int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev,
+static int apci3501_config_insn_timer(struct comedi_device *dev,
-						 struct comedi_subdevice *s,
+				      struct comedi_subdevice *s,
-						 struct comedi_insn *insn,
+				      struct comedi_insn *insn,
-						 unsigned int *data)
+				      unsigned int *data)
 {
 	struct apci3501_private *devpriv = dev->private;
 	unsigned int ul_Command1 = 0;
@@ -86,10 +86,10 @@ static int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev,
 *		  0 Stop
 *		  2 Trigger
 */
-static int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
+static int apci3501_write_insn_timer(struct comedi_device *dev,
-							 struct comedi_subdevice *s,
+				     struct comedi_subdevice *s,
-							 struct comedi_insn *insn,
+				     struct comedi_insn *insn,
-							 unsigned int *data)
+				     unsigned int *data)
 {
 	struct apci3501_private *devpriv = dev->private;
 	unsigned int ul_Command1 = 0;
@@ -153,10 +153,10 @@ static int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *d
 *		  2 Watchdog
 *	data[1] : Timer Counter Watchdog Number
 */
-static int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev,
+static int apci3501_read_insn_timer(struct comedi_device *dev,
-					       struct comedi_subdevice *s,
+				    struct comedi_subdevice *s,
-					       struct comedi_insn *insn,
+				    struct comedi_insn *insn,
-					       unsigned int *data)
+				    unsigned int *data)
 {
 	struct apci3501_private *devpriv = dev->private;

--- a/drivers/staging/comedi/drivers/addi_apci_035.c
+++ b/drivers/staging/comedi/drivers/addi_apci_035.c
@@ -27,13 +27,13 @@ static const struct addi_board apci035_boardtypes[] = {
 		.i_Timer		= 1,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.ui_MinDelaytimeNs	= 100000,
-		.interrupt		= v_APCI035_Interrupt,
+		.interrupt		= apci035_interrupt,
-		.reset			= i_APCI035_Reset,
+		.reset			= apci035_reset,
-		.ai_config		= i_APCI035_ConfigAnalogInput,
+		.ai_config		= apci035_ai_config,
-		.ai_read		= i_APCI035_ReadAnalogInput,
+		.ai_read		= apci035_ai_read,
-		.timer_config		= i_APCI035_ConfigTimerWatchdog,
+		.timer_config		= apci035_timer_config,
-		.timer_write		= i_APCI035_StartStopWriteTimerWatchdog,
+		.timer_write		= apci035_timer_write,
-		.timer_read		= i_APCI035_ReadTimerWatchdog,
+		.timer_read		= apci035_timer_read,
 	},
 };

--- a/drivers/staging/comedi/drivers/addi_apci_1500.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1500.c
@@ -20,19 +20,19 @@ static const struct addi_board apci1500_boardtypes[] = {
 		.i_NbrDoChannel		= 16,
 		.i_DoMaxdata		= 0xffff,
 		.i_Timer		= 1,
-		.interrupt		= v_APCI1500_Interrupt,
+		.interrupt		= apci1500_interrupt,
-		.reset			= i_APCI1500_Reset,
+		.reset			= apci1500_reset,
-		.di_config		= i_APCI1500_ConfigDigitalInputEvent,
+		.di_config		= apci1500_di_config,
-		.di_read		= i_APCI1500_Initialisation,
+		.di_read		= apci1500_di_read,
-		.di_write		= i_APCI1500_StartStopInputEvent,
+		.di_write		= apci1500_di_write,
 		.di_bits		= apci1500_di_insn_bits,
-		.do_config		= i_acpi1500_config_output,
+		.do_config		= apci1500_do_config,
-		.do_write		= i_APCI1500_WriteDigitalOutput,
+		.do_write		= apci1500_do_write,
-		.do_bits		= i_APCI1500_ConfigureInterrupt,
+		.do_bits		= apci1500_do_bits,
-		.timer_config		= i_APCI1500_ConfigCounterTimerWatchdog,
+		.timer_config		= apci1500_timer_config,
-		.timer_write		= i_apci1500_timer_watchdog,
+		.timer_write		= apci1500_timer_write,
-		.timer_read		= i_APCI1500_ReadInterruptMask,
+		.timer_read		= apci1500_timer_read,
-		.timer_bits		= i_APCI1500_ReadCounterTimerWatchdog,
+		.timer_bits		= apci1500_timer_bits,
 	},
 };

--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -21,16 +21,16 @@ static const struct addi_board apci1564_boardtypes[] = {
 		.i_NbrDoChannel		= 32,
 		.i_DoMaxdata		= 0xffffffff,
 		.i_Timer		= 1,
-		.interrupt		= v_APCI1564_Interrupt,
+		.interrupt		= apci1564_interrupt,
-		.reset			= i_APCI1564_Reset,
+		.reset			= apci1564_reset,
-		.di_config		= i_APCI1564_ConfigDigitalInput,
+		.di_config		= apci1564_di_config,
 		.di_bits		= apci1564_di_insn_bits,
-		.do_config		= i_APCI1564_ConfigDigitalOutput,
+		.do_config		= apci1564_do_config,
 		.do_bits		= apci1564_do_insn_bits,
-		.do_read		= i_APCI1564_ReadInterruptStatus,
+		.do_read		= apci1564_do_read,
-		.timer_config		= i_APCI1564_ConfigTimerCounterWatchdog,
+		.timer_config		= apci1564_timer_config,
-		.timer_write		= i_APCI1564_StartStopWriteTimerCounterWatchdog,
+		.timer_write		= apci1564_timer_write,
-		.timer_read		= i_APCI1564_ReadTimerCounterWatchdog,
+		.timer_read		= apci1564_timer_read,
 	},
 };

--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -26,7 +26,7 @@ static const struct addi_board apci3120_boardtypes[] = {
 		.i_NbrDiChannel		= 4,
 		.i_NbrDoChannel		= 4,
 		.i_DoMaxdata		= 0x0f,
-		.interrupt		= v_APCI3120_Interrupt,
+		.interrupt		= apci3120_interrupt,
 	},
 	[BOARD_APCI3001] = {
 		.pc_DriverName		= "apci3001",
@@ -37,7 +37,7 @@ static const struct addi_board apci3120_boardtypes[] = {
 		.i_NbrDiChannel		= 4,
 		.i_NbrDoChannel		= 4,
 		.i_DoMaxdata		= 0x0f,
-		.interrupt		= v_APCI3120_Interrupt,
+		.interrupt		= apci3120_interrupt,
 	},
 };
@@ -136,11 +136,11 @@ static int apci3120_auto_attach(struct comedi_device *dev,
 	s->len_chanlist = this_board->i_AiChannelList;
 	s->range_table = &range_apci3120_ai;
-	s->insn_config = i_APCI3120_InsnConfigAnalogInput;
+	s->insn_config = apci3120_ai_insn_config;
-	s->insn_read = i_APCI3120_InsnReadAnalogInput;
+	s->insn_read = apci3120_ai_insn_read;
-	s->do_cmdtest = i_APCI3120_CommandTestAnalogInput;
+	s->do_cmdtest = apci3120_ai_cmdtest;
-	s->do_cmd = i_APCI3120_CommandAnalogInput;
+	s->do_cmd = apci3120_ai_cmd;
-	s->cancel = i_APCI3120_StopCyclicAcquisition;
+	s->cancel = apci3120_cancel;
 	/*  Allocate and Initialise AO Subdevice Structures */
 	s = &dev->subdevices[1];
@@ -151,7 +151,7 @@ static int apci3120_auto_attach(struct comedi_device *dev,
 		s->maxdata = this_board->i_AoMaxdata;
 		s->len_chanlist = this_board->i_NbrAoChannel;
 		s->range_table = &range_apci3120_ao;
-		s->insn_write = i_APCI3120_InsnWriteAnalogOutput;
+		s->insn_write = apci3120_ao_insn_write;
 	} else {
 		s->type = COMEDI_SUBD_UNUSED;
 	}
@@ -186,11 +186,11 @@ static int apci3120_auto_attach(struct comedi_device *dev,
 	s->len_chanlist = 1;
 	s->range_table = &range_digital;
-	s->insn_write = i_APCI3120_InsnWriteTimer;
+	s->insn_write = apci3120_write_insn_timer;
-	s->insn_read = i_APCI3120_InsnReadTimer;
+	s->insn_read = apci3120_read_insn_timer;
-	s->insn_config = i_APCI3120_InsnConfigTimer;
+	s->insn_config = apci3120_config_insn_timer;
-	i_APCI3120_Reset(dev);
+	apci3120_reset(dev);
 	return 0;
 }
@@ -200,7 +200,7 @@ static void apci3120_detach(struct comedi_device *dev)
 	if (devpriv) {
 		if (dev->iobase)
-			i_APCI3120_Reset(dev);
+			apci3120_reset(dev);
 		if (dev->irq)
 			free_irq(dev->irq, dev);
 		if (devpriv->ul_DmaBufferVirtual[0]) {

--- a/drivers/staging/comedi/drivers/addi_apci_3200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3200.c
@@ -43,15 +43,15 @@ static const struct addi_board apci3200_boardtypes[] = {
 		.i_NbrDoChannel		= 4,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.ui_MinDelaytimeNs	= 100000,
-		.interrupt		= v_APCI3200_Interrupt,
+		.interrupt		= apci3200_interrupt,
-		.reset			= i_APCI3200_Reset,
+		.reset			= apci3200_reset,
-		.ai_config		= i_APCI3200_ConfigAnalogInput,
+		.ai_config		= apci3200_ai_config,
-		.ai_read		= i_APCI3200_ReadAnalogInput,
+		.ai_read		= apci3200_ai_read,
-		.ai_write		= i_APCI3200_InsnWriteReleaseAnalogInput,
+		.ai_write		= apci3200_ai_write,
-		.ai_bits		= i_APCI3200_InsnBits_AnalogInput_Test,
+		.ai_bits		= apci3200_ai_bits_test,
-		.ai_cmdtest		= i_APCI3200_CommandTestAnalogInput,
+		.ai_cmdtest		= apci3200_ai_cmdtest,
-		.ai_cmd			= i_APCI3200_CommandAnalogInput,
+		.ai_cmd			= apci3200_ai_cmd,
-		.ai_cancel		= i_APCI3200_StopCyclicAcquisition,
+		.ai_cancel		= apci3200_cancel,
 		.di_bits		= apci3200_di_insn_bits,
 		.do_bits		= apci3200_do_insn_bits,
 	},
@@ -68,15 +68,15 @@ static const struct addi_board apci3200_boardtypes[] = {
 		.i_NbrDoChannel		= 4,
 		.ui_MinAcquisitiontimeNs = 10000,
 		.ui_MinDelaytimeNs	= 100000,
-		.interrupt		= v_APCI3200_Interrupt,
+		.interrupt		= apci3200_interrupt,
-		.reset			= i_APCI3200_Reset,
+		.reset			= apci3200_reset,
-		.ai_config		= i_APCI3200_ConfigAnalogInput,
+		.ai_config		= apci3200_ai_config,
-		.ai_read		= i_APCI3200_ReadAnalogInput,
+		.ai_read		= apci3200_ai_read,
-		.ai_write		= i_APCI3200_InsnWriteReleaseAnalogInput,
+		.ai_write		= apci3200_ai_write,
-		.ai_bits		= i_APCI3200_InsnBits_AnalogInput_Test,
+		.ai_bits		= apci3200_ai_bits_test,
-		.ai_cmdtest		= i_APCI3200_CommandTestAnalogInput,
+		.ai_cmdtest		= apci3200_ai_cmdtest,
-		.ai_cmd			= i_APCI3200_CommandAnalogInput,
+		.ai_cmd			= apci3200_ai_cmd,
-		.ai_cancel		= i_APCI3200_StopCyclicAcquisition,
+		.ai_cancel		= apci3200_cancel,
 		.di_bits		= apci3200_di_insn_bits,
 		.do_bits		= apci3200_do_insn_bits,
 	},

--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -390,9 +390,9 @@ static int apci3501_auto_attach(struct comedi_device *dev,
 	s->maxdata = 0;
 	s->len_chanlist = 1;
 	s->range_table = &range_digital;
-	s->insn_write = i_APCI3501_StartStopWriteTimerCounterWatchdog;
+	s->insn_write = apci3501_write_insn_timer;
-	s->insn_read = i_APCI3501_ReadTimerCounterWatchdog;
+	s->insn_read = apci3501_read_insn_timer;
-	s->insn_config = i_APCI3501_ConfigTimerCounterWatchdog;
+	s->insn_config = apci3501_config_insn_timer;
 	/* Initialize the eeprom subdevice */
 	s = &dev->subdevices[4];