[PATCH 14/36] staging: comedi: ni_tio_internal.h: replace NITIO_Gxx_Joint_Status2_Reg()

H Hartley Sweeten hsweeten at visionengravers.com
Thu Dec 19 23:31:46 UTC 2013


The shared "Status2" registers are sequential in the enum ni_gpct_register.
Replace this inline CamelCase function with a simple define.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/ni_tio_internal.h | 14 +-------------
 drivers/staging/comedi/drivers/ni_tiocmd.c       |  2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_tio_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h
index 75e6220..1d6efa4 100644
--- a/drivers/staging/comedi/drivers/ni_tio_internal.h
+++ b/drivers/staging/comedi/drivers/ni_tio_internal.h
@@ -33,19 +33,7 @@
 #define NITIO_STATUS_REG(x)		(NITIO_G01_STATUS + ((x) / 2))
 #define NITIO_RESET_REG(x)		(NITIO_G01_RESET + ((x) / 2))
 #define NITIO_STATUS1_REG(x)		(NITIO_G01_STATUS1 + ((x) / 2))
-
-static inline enum ni_gpct_register NITIO_Gxx_Joint_Status2_Reg(unsigned idx)
-{
-	switch (idx) {
-	case 0:
-	case 1:
-		return NITIO_G01_STATUS2;
-	case 2:
-	case 3:
-		return NITIO_G23_STATUS2;
-	}
-	return 0;
-}
+#define NITIO_STATUS2_REG(x)		(NITIO_G01_STATUS2 + ((x) / 2))
 
 static inline enum ni_gpct_register NITIO_Gi_DMA_Config_Reg(unsigned idx)
 {
diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c
index 0ffb3a4..bfae717 100644
--- a/drivers/staging/comedi/drivers/ni_tiocmd.c
+++ b/drivers/staging/comedi/drivers/ni_tiocmd.c
@@ -408,7 +408,7 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error,
 				*stale_data = 1;
 		}
 		if (read_register(counter,
-				  NITIO_Gxx_Joint_Status2_Reg
+				  NITIO_STATUS2_REG
 				  (counter->counter_index)) &
 		    Gi_Permanent_Stale_Bit(counter->counter_index)) {
 			dev_info(counter->counter_dev->dev->class_dev,
-- 
1.8.5.2



More information about the devel mailing list