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_M_Series_PFI_Gate_Select() 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:38 -07:00 • committed by Greg Kroah-Hartman
parent cfd5fed200
commit 03c7867123
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -173,14 +173,7 @@ enum ni_m_series_gate_select {
NI_M_Series_Logic_Low_Gate_Select = 0x1f, NI_M_Series_Logic_Low_Gate_Select = 0x1f,
}; };
#define NI_M_RTSI_GATE_SEL(x) (((x) == 7) ? 0x1b : (0xb + (x))) #define NI_M_RTSI_GATE_SEL(x) (((x) == 7) ? 0x1b : (0xb + (x)))
#define NI_M_PFI_GATE_SEL(x) (((x) < 10) ? (1 + (x)) : (0xb + (x)))
static inline unsigned NI_M_Series_PFI_Gate_Select(unsigned n)
{
BUG_ON(n > ni_m_series_max_pfi_channel);
if (n < 10)
return 1 + n;
return 0xb + n;
}
static inline unsigned Gi_Source_Select_Bits(unsigned source) static inline unsigned Gi_Source_Select_Bits(unsigned source)
{ {
@ -1251,10 +1244,8 @@ ni_m_series_first_gate_to_generic_gate_source(unsigned ni_m_series_gate_select)
if (i <= ni_m_series_max_rtsi_channel) if (i <= ni_m_series_max_rtsi_channel)
break; break;
for (i = 0; i <= ni_m_series_max_pfi_channel; ++i) { for (i = 0; i <= ni_m_series_max_pfi_channel; ++i) {
if (ni_m_series_gate_select == if (ni_m_series_gate_select == NI_M_PFI_GATE_SEL(i))
NI_M_Series_PFI_Gate_Select(i)) {
return NI_GPCT_PFI_GATE_SELECT(i); return NI_GPCT_PFI_GATE_SELECT(i);
}
} }
if (i <= ni_m_series_max_pfi_channel) if (i <= ni_m_series_max_pfi_channel)
break; break;