evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
H Hartley Sweeten 2014-07-24 10:14:39 -07:00 • committed by Greg Kroah-Hartman
parent 03c7867123
commit cdf4fce421
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/staging/comedi/drivers/ni_tio.c
View file

@ -127,11 +127,7 @@ static inline unsigned NI_660x_RTSI_Clock(unsigned n)
} }
static const unsigned ni_660x_max_source_pin = 7; static const unsigned ni_660x_max_source_pin = 7;
static inline unsigned NI_660x_Source_Pin_Clock(unsigned n) #define NI_660X_SRC_PIN_CLK(x) (0x2 + (x))
{
BUG_ON(n > ni_660x_max_source_pin);
return 0x2 + n;
}
/* clock sources for ni e and m series boards, get bits with Gi_Source_Select_Bits() */ /* clock sources for ni e and m series boards, get bits with Gi_Source_Select_Bits() */
enum ni_m_series_clock_source { 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) { for (i = 0; i <= ni_660x_max_source_pin; ++i) {
if (clock_select_bits == if (clock_select_bits ==
NI_GPCT_SOURCE_PIN_CLOCK_SRC_BITS(i)) { 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; break;
} }
} }
@ -822,7 +818,7 @@ static unsigned ni_660x_clock_src_select(const struct ni_gpct *counter)
if (i <= ni_660x_max_rtsi_channel) if (i <= ni_660x_max_rtsi_channel)
break; break;
for (i = 0; i <= ni_660x_max_source_pin; ++i) { 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 = clock_source =
NI_GPCT_SOURCE_PIN_CLOCK_SRC_BITS(i); NI_GPCT_SOURCE_PIN_CLOCK_SRC_BITS(i);
break; break;