From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Thu, 19 Dec 2013 23:31:45 +0000 (-0700)
Subject: staging: comedi: ni_tio_internal.h: replace NITIO_Gxx_Joint_Status1_Reg()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=450a7c43e8742a176e451ff2dfc3e22eae839987;p=deliverable%2Flinux.git

staging: comedi: ni_tio_internal.h: replace NITIO_Gxx_Joint_Status1_Reg()

The shared "Status1" 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@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_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h
index f9eb2d0f6cb6..75e622030746 100644
--- a/drivers/staging/comedi/drivers/ni_tio_internal.h
+++ b/drivers/staging/comedi/drivers/ni_tio_internal.h
@@ -32,19 +32,7 @@
 #define NITIO_GATE2_REG(x)		(NITIO_G0_GATE2 + (x))
 #define NITIO_STATUS_REG(x)		(NITIO_G01_STATUS + ((x) / 2))
 #define NITIO_RESET_REG(x)		(NITIO_G01_RESET + ((x) / 2))
-
-static inline enum ni_gpct_register NITIO_Gxx_Joint_Status1_Reg(unsigned idx)
-{
-	switch (idx) {
-	case 0:
-	case 1:
-		return NITIO_G01_STATUS1;
-	case 2:
-	case 3:
-		return NITIO_G23_STATUS1;
-	}
-	return 0;
-}
+#define NITIO_STATUS1_REG(x)		(NITIO_G01_STATUS1 + ((x) / 2))
 
 static inline enum ni_gpct_register NITIO_Gxx_Joint_Status2_Reg(unsigned idx)
 {