leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: ni_tio: convert NI_M_Series_RTSI_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:37 -07:00 committed by Greg Kroah-Hartman
parent 5f8c74429a
commit cfd5fed200
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/comedi/drivers/ni_tio.c
View File

@ -172,13 +172,7 @@ enum ni_m_series_gate_select {
NI_M_Series_Analog_Trigger_Out_Gate_Select = 0x1e, NI_M_Series_Analog_Trigger_Out_Gate_Select = 0x1e,
NI_M_Series_Logic_Low_Gate_Select = 0x1f, NI_M_Series_Logic_Low_Gate_Select = 0x1f,
}; };
static inline unsigned NI_M_Series_RTSI_Gate_Select(unsigned n) #define NI_M_RTSI_GATE_SEL(x) (((x) == 7) ? 0x1b : (0xb + (x)))
{
BUG_ON(n > ni_m_series_max_rtsi_channel);
if (n == 7)
return 0x1b;
return 0xb + n;
}
static inline unsigned NI_M_Series_PFI_Gate_Select(unsigned n) static inline unsigned NI_M_Series_PFI_Gate_Select(unsigned n)
{ {
@ -1251,10 +1245,8 @@ ni_m_series_first_gate_to_generic_gate_source(unsigned ni_m_series_gate_select)
return NI_GPCT_LOGIC_LOW_GATE_SELECT; return NI_GPCT_LOGIC_LOW_GATE_SELECT;
default: default:
for (i = 0; i <= ni_m_series_max_rtsi_channel; ++i) { for (i = 0; i <= ni_m_series_max_rtsi_channel; ++i) {
if (ni_m_series_gate_select == if (ni_m_series_gate_select == NI_M_RTSI_GATE_SEL(i))
NI_M_Series_RTSI_Gate_Select(i)) {
return NI_GPCT_RTSI_GATE_SELECT(i); return NI_GPCT_RTSI_GATE_SELECT(i);
}
} }
if (i <= ni_m_series_max_rtsi_channel) if (i <= ni_m_series_max_rtsi_channel)
break; break;