From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Thu, 24 Jul 2014 17:14:45 +0000 (-0700)
Subject: staging: comedi: ni_tio: tidy up enum ni_660x_second_gate_select
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7e3e7591631290617ca0a5bc9bd05aabf547d87d;p=openwrt%2Fstaging%2Fblogic.git

staging: comedi: ni_tio: tidy up enum ni_660x_second_gate_select

These values are not used as an enum. For aesthetics, rename the
CamelCase values and convert them into defines.

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>
---

diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c
index 6da4ab588385..6ef64a6efea7 100644
--- a/drivers/staging/comedi/drivers/ni_tio.c
+++ b/drivers/staging/comedi/drivers/ni_tio.c
@@ -177,17 +177,16 @@ static inline unsigned Gi_Gate_Select_Bits(unsigned gate_select)
 	return (gate_select << Gi_Gate_Select_Shift) & Gi_Gate_Select_Mask;
 }
 
-enum ni_660x_second_gate_select {
-	NI_660x_Source_Pin_i_Second_Gate_Select = 0x0,
-	NI_660x_Up_Down_Pin_i_Second_Gate_Select = 0x1,
-	NI_660x_Next_SRC_Second_Gate_Select = 0xa,
-	NI_660x_Next_Out_Second_Gate_Select = 0x14,
-	NI_660x_Selected_Gate_Second_Gate_Select = 0x1e,
-	NI_660x_Logic_Low_Second_Gate_Select = 0x1f,
-};
-#define NI_660X_MAX_UP_DOWN_PIN		7
+/* NI660X second gate select */
+#define NI_660X_SRC_PIN_I_GATE2_SEL	0x0
+#define NI_660X_UD_PIN_I_GATE2_SEL	0x1
 #define NI_660X_UD_PIN_GATE2_SEL(x)	(0x2 + (x))
+#define NI_660X_NEXT_SRC_GATE2_SEL	0xa
 #define NI_660X_RTSI_GATE2_SEL(x)	(0xb + (x))
+#define NI_660X_NEXT_OUT_GATE2_SEL	0x14
+#define NI_660X_SELECTED_GATE2_SEL	0x1e
+#define NI_660X_LOGIC_LOW_GATE2_SEL	0x1f
+#define NI_660X_MAX_UP_DOWN_PIN		7
 
 struct ni_gpct_device *
 ni_gpct_device_construct(struct comedi_device *dev,
@@ -1004,7 +1003,7 @@ static int ni_660x_set_second_gate(struct ni_gpct *counter,
 		gate2_sel = chan & 0x1f;
 		break;
 	case NI_GPCT_NEXT_SOURCE_GATE_SELECT:
-		gate2_sel = NI_660x_Next_SRC_Second_Gate_Select;
+		gate2_sel = NI_660X_NEXT_SRC_GATE2_SEL;
 		break;
 	default:
 		for (i = 0; i <= NI_660X_MAX_RTSI_CHAN; ++i) {
@@ -1241,17 +1240,17 @@ ni_660x_second_gate_to_generic_gate_source(unsigned ni_660x_gate_select)
 	unsigned i;
 
 	switch (ni_660x_gate_select) {
-	case NI_660x_Source_Pin_i_Second_Gate_Select:
+	case NI_660X_SRC_PIN_I_GATE2_SEL:
 		return NI_GPCT_SOURCE_PIN_i_GATE_SELECT;
-	case NI_660x_Up_Down_Pin_i_Second_Gate_Select:
+	case NI_660X_UD_PIN_I_GATE2_SEL:
 		return NI_GPCT_UP_DOWN_PIN_i_GATE_SELECT;
-	case NI_660x_Next_SRC_Second_Gate_Select:
+	case NI_660X_NEXT_SRC_GATE2_SEL:
 		return NI_GPCT_NEXT_SOURCE_GATE_SELECT;
-	case NI_660x_Next_Out_Second_Gate_Select:
+	case NI_660X_NEXT_OUT_GATE2_SEL:
 		return NI_GPCT_NEXT_OUT_GATE_SELECT;
-	case NI_660x_Selected_Gate_Second_Gate_Select:
+	case NI_660X_SELECTED_GATE2_SEL:
 		return NI_GPCT_SELECTED_GATE_GATE_SELECT;
-	case NI_660x_Logic_Low_Second_Gate_Select:
+	case NI_660X_LOGIC_LOW_GATE2_SEL:
 		return NI_GPCT_LOGIC_LOW_GATE_SELECT;
 	default:
 		for (i = 0; i <= NI_660X_MAX_RTSI_CHAN; ++i) {