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_RTSI_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:40 -07:00 • committed by Greg Kroah-Hartman
parent cdf4fce421
commit 288cb1a87c
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

@ -120,11 +120,7 @@ enum ni_660x_clock_source {
NI_660x_Logic_Low_Clock = 0x1f, NI_660x_Logic_Low_Clock = 0x1f,
}; };
static const unsigned ni_660x_max_rtsi_channel = 6; static const unsigned ni_660x_max_rtsi_channel = 6;
static inline unsigned NI_660x_RTSI_Clock(unsigned n) #define NI_660X_RTSI_CLK(x) (0xb + (x))
{
BUG_ON(n > ni_660x_max_rtsi_channel);
return 0xb + n;
}
static const unsigned ni_660x_max_source_pin = 7; static const unsigned ni_660x_max_source_pin = 7;
#define NI_660X_SRC_PIN_CLK(x) (0x2 + (x)) #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: default:
for (i = 0; i <= ni_660x_max_rtsi_channel; ++i) { for (i = 0; i <= ni_660x_max_rtsi_channel; ++i) {
if (clock_select_bits == NI_GPCT_RTSI_CLOCK_SRC_BITS(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; break;
} }
} }
@ -810,7 +806,7 @@ static unsigned ni_660x_clock_src_select(const struct ni_gpct *counter)
break; break;
default: default:
for (i = 0; i <= ni_660x_max_rtsi_channel; ++i) { 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); clock_source = NI_GPCT_RTSI_CLOCK_SRC_BITS(i);
break; break;
} }