From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 22 Mar 2016 18:10:49 +0000 (-0700)
Subject: staging: comedi: ni_660x: sort enum ni_660x_register
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=242311d1a9e5cebde39855e064dcc4ac0dabde93;p=deliverable%2Flinux.git

staging: comedi: ni_660x: sort enum ni_660x_register

Sort this enum so that it has a 1:1 relationship with the ni_tio.h
enum ni_gpct_register.

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_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index 1cca9ea5cdd2..ad67ee5ec7ff 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -43,78 +43,79 @@
 
 /* See Register-Level Programmer Manual page 3.1 */
 enum ni_660x_register {
-	NI660X_G0_INT_ACK,
-	NI660X_G0_STATUS,
-	NI660X_G1_INT_ACK,
-	NI660X_G1_STATUS,
-	NI660X_G01_STATUS,
+	NI660X_G0_AUTO_INC,
+	NI660X_G1_AUTO_INC,
+	NI660X_G2_AUTO_INC,
+	NI660X_G3_AUTO_INC,
 	NI660X_G0_CMD,
-	NI660X_STC_DIO_PARALLEL_INPUT,
 	NI660X_G1_CMD,
+	NI660X_G2_CMD,
+	NI660X_G3_CMD,
 	NI660X_G0_HW_SAVE,
 	NI660X_G1_HW_SAVE,
-	NI660X_STC_DIO_OUTPUT,
-	NI660X_STC_DIO_CONTROL,
+	NI660X_G2_HW_SAVE,
+	NI660X_G3_HW_SAVE,
 	NI660X_G0_SW_SAVE,
 	NI660X_G1_SW_SAVE,
+	NI660X_G2_SW_SAVE,
+	NI660X_G3_SW_SAVE,
 	NI660X_G0_MODE,
-	NI660X_G01_STATUS1,
 	NI660X_G1_MODE,
-	NI660X_STC_DIO_SERIAL_INPUT,
+	NI660X_G2_MODE,
+	NI660X_G3_MODE,
 	NI660X_G0_LOADA,
-	NI660X_G01_STATUS2,
-	NI660X_G0_LOADB,
 	NI660X_G1_LOADA,
+	NI660X_G2_LOADA,
+	NI660X_G3_LOADA,
+	NI660X_G0_LOADB,
 	NI660X_G1_LOADB,
+	NI660X_G2_LOADB,
+	NI660X_G3_LOADB,
 	NI660X_G0_INPUT_SEL,
 	NI660X_G1_INPUT_SEL,
-	NI660X_G0_AUTO_INC,
-	NI660X_G1_AUTO_INC,
-	NI660X_G01_RESET,
-	NI660X_G0_INT_ENA,
-	NI660X_G1_INT_ENA,
+	NI660X_G2_INPUT_SEL,
+	NI660X_G3_INPUT_SEL,
 	NI660X_G0_CNT_MODE,
 	NI660X_G1_CNT_MODE,
+	NI660X_G2_CNT_MODE,
+	NI660X_G3_CNT_MODE,
 	NI660X_G0_GATE2,
 	NI660X_G1_GATE2,
+	NI660X_G2_GATE2,
+	NI660X_G3_GATE2,
+	NI660X_G01_STATUS,
+	NI660X_G23_STATUS,
+	NI660X_G01_RESET,
+	NI660X_G23_RESET,
+	NI660X_G01_STATUS1,
+	NI660X_G23_STATUS1,
+	NI660X_G01_STATUS2,
+	NI660X_G23_STATUS2,
 	NI660X_G0_DMA_CFG,
-	NI660X_G0_DMA_STATUS,
 	NI660X_G1_DMA_CFG,
+	NI660X_G2_DMA_CFG,
+	NI660X_G3_DMA_CFG,
+	NI660X_G0_DMA_STATUS,
 	NI660X_G1_DMA_STATUS,
+	NI660X_G2_DMA_STATUS,
+	NI660X_G3_DMA_STATUS,
+	NI660X_G0_INT_ACK,
+	NI660X_G1_INT_ACK,
 	NI660X_G2_INT_ACK,
-	NI660X_G2_STATUS,
 	NI660X_G3_INT_ACK,
+	NI660X_G0_STATUS,
+	NI660X_G1_STATUS,
+	NI660X_G2_STATUS,
 	NI660X_G3_STATUS,
-	NI660X_G23_STATUS,
-	NI660X_G2_CMD,
-	NI660X_G3_CMD,
-	NI660X_G2_HW_SAVE,
-	NI660X_G3_HW_SAVE,
-	NI660X_G2_SW_SAVE,
-	NI660X_G3_SW_SAVE,
-	NI660X_G2_MODE,
-	NI660X_G23_STATUS1,
-	NI660X_G3_MODE,
-	NI660X_G2_LOADA,
-	NI660X_G23_STATUS2,
-	NI660X_G2_LOADB,
-	NI660X_G3_LOADA,
-	NI660X_G3_LOADB,
-	NI660X_G2_INPUT_SEL,
-	NI660X_G3_INPUT_SEL,
-	NI660X_G2_AUTO_INC,
-	NI660X_G3_AUTO_INC,
-	NI660X_G23_RESET,
+	NI660X_G0_INT_ENA,
+	NI660X_G1_INT_ENA,
 	NI660X_G2_INT_ENA,
 	NI660X_G3_INT_ENA,
-	NI660X_G2_CNT_MODE,
-	NI660X_G3_CNT_MODE,
-	NI660X_G3_GATE2,
-	NI660X_G2_GATE2,
-	NI660X_G2_DMA_CFG,
-	NI660X_G2_DMA_STATUS,
-	NI660X_G3_DMA_CFG,
-	NI660X_G3_DMA_STATUS,
+
+	NI660X_STC_DIO_PARALLEL_INPUT = NITIO_NUM_REGS,
+	NI660X_STC_DIO_OUTPUT,
+	NI660X_STC_DIO_CONTROL,
+	NI660X_STC_DIO_SERIAL_INPUT,
 	NI660X_DIO32_INPUT,
 	NI660X_DIO32_OUTPUT,
 	NI660X_CLK_CFG,