From cdf4fce4211be5af3915a10f2ea9a28d2696c2cb Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 24 Jul 2014 10:14:39 -0700 Subject: [PATCH] staging: comedi: ni_tio: convert NI_660x_Source_Pin_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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/ni_tio.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c index ee9c8534fe79..a7cd59b7e8de 100644 --- a/drivers/staging/comedi/drivers/ni_tio.c +++ b/drivers/staging/comedi/drivers/ni_tio.c @@ -127,11 +127,7 @@ static inline unsigned NI_660x_RTSI_Clock(unsigned n) } static const unsigned ni_660x_max_source_pin = 7; -static inline unsigned NI_660x_Source_Pin_Clock(unsigned n) -{ - BUG_ON(n > ni_660x_max_source_pin); - return 0x2 + n; -} +#define NI_660X_SRC_PIN_CLK(x) (0x2 + (x)) /* clock sources for ni e and m series boards, get bits with Gi_Source_Select_Bits() */ enum ni_m_series_clock_source { @@ -540,7 +536,7 @@ static unsigned ni_660x_source_select_bits(unsigned int clock_source) for (i = 0; i <= ni_660x_max_source_pin; ++i) { if (clock_select_bits == NI_GPCT_SOURCE_PIN_CLOCK_SRC_BITS(i)) { - ni_660x_clock = NI_660x_Source_Pin_Clock(i); + ni_660x_clock = NI_660X_SRC_PIN_CLK(i); break; } } @@ -822,7 +818,7 @@ static unsigned ni_660x_clock_src_select(const struct ni_gpct *counter) if (i <= ni_660x_max_rtsi_channel) break; for (i = 0; i <= ni_660x_max_source_pin; ++i) { - if (input_select == NI_660x_Source_Pin_Clock(i)) { + if (input_select == NI_660X_SRC_PIN_CLK(i)) { clock_source = NI_GPCT_SOURCE_PIN_CLOCK_SRC_BITS(i); break; -- 2.20.1