diff options
| author | H Hartley Sweeten <[email protected]> | 2014-07-24 10:14:37 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2014-07-27 11:16:47 -0700 |
| commit | cfd5fed2004c4c48247ae7766f8705ec2438a2ce (patch) | |
| tree | 58c69a8c2d60c1284d1b850b8396e74dae4abeb1 | |
| parent | 5f8c74429a5f328ab541ddce31d578807e5bcf9c (diff) | |
staging: comedi: ni_tio: convert NI_M_Series_RTSI_Gate_Select() 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 <[email protected]>
Reviewed-by: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_tio.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c index 1fb9a5c26a32..60ec33fe100a 100644 --- a/drivers/staging/comedi/drivers/ni_tio.c +++ b/drivers/staging/comedi/drivers/ni_tio.c @@ -172,13 +172,7 @@ enum ni_m_series_gate_select { NI_M_Series_Analog_Trigger_Out_Gate_Select = 0x1e, NI_M_Series_Logic_Low_Gate_Select = 0x1f, }; -static inline unsigned NI_M_Series_RTSI_Gate_Select(unsigned n) -{ - BUG_ON(n > ni_m_series_max_rtsi_channel); - if (n == 7) - return 0x1b; - return 0xb + n; -} +#define NI_M_RTSI_GATE_SEL(x) (((x) == 7) ? 0x1b : (0xb + (x))) 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; default: for (i = 0; i <= ni_m_series_max_rtsi_channel; ++i) { - if (ni_m_series_gate_select == - NI_M_Series_RTSI_Gate_Select(i)) { + if (ni_m_series_gate_select == NI_M_RTSI_GATE_SEL(i)) return NI_GPCT_RTSI_GATE_SELECT(i); - } } if (i <= ni_m_series_max_rtsi_channel) break; |