From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Thu, 24 Jul 2014 17:14:40 +0000 (-0700)
Subject: staging: comedi: ni_tio: convert NI_660x_RTSI_Clock() to a macro
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=288cb1a87c63ab4df05936c8842474c9b5530af4;p=deliverable%2Flinux.git

staging: comedi: ni_tio: convert NI_660x_RTSI_Clock() to a macro

The BUG_ON() in this function can never happen.

For aesthetics, rename this CamelCase inline function and convert it into
a simple macro.

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 a7cd59b7e8de..422052ffda7d 100644
--- a/drivers/staging/comedi/drivers/ni_tio.c
+++ b/drivers/staging/comedi/drivers/ni_tio.c
@@ -120,11 +120,7 @@ enum ni_660x_clock_source {
 	NI_660x_Logic_Low_Clock = 0x1f,
 };
 static const unsigned ni_660x_max_rtsi_channel = 6;
-static inline unsigned NI_660x_RTSI_Clock(unsigned n)
-{
-	BUG_ON(n > ni_660x_max_rtsi_channel);
-	return 0xb + n;
-}
+#define NI_660X_RTSI_CLK(x)		(0xb + (x))
 
 static const unsigned ni_660x_max_source_pin = 7;
 #define NI_660X_SRC_PIN_CLK(x)		(0x2 + (x))
@@ -527,7 +523,7 @@ static unsigned ni_660x_source_select_bits(unsigned int clock_source)
 	default:
 		for (i = 0; i <= ni_660x_max_rtsi_channel; ++i) {
 			if (clock_select_bits == NI_GPCT_RTSI_CLOCK_SRC_BITS(i)) {
-				ni_660x_clock = NI_660x_RTSI_Clock(i);
+				ni_660x_clock = NI_660X_RTSI_CLK(i);
 				break;
 			}
 		}
@@ -810,7 +806,7 @@ static unsigned ni_660x_clock_src_select(const struct ni_gpct *counter)
 		break;
 	default:
 		for (i = 0; i <= ni_660x_max_rtsi_channel; ++i) {
-			if (input_select == NI_660x_RTSI_Clock(i)) {
+			if (input_select == NI_660X_RTSI_CLK(i)) {
 				clock_source = NI_GPCT_RTSI_CLOCK_SRC_BITS(i);
 				break;
 			}