diff options
| author | H Hartley Sweeten <[email protected]> | 2014-07-24 10:14:36 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2014-07-27 11:16:47 -0700 |
| commit | 5f8c74429a5f328ab541ddce31d578807e5bcf9c (patch) | |
| tree | c0b327a433c2144468c2ba43a51e891916992076 | |
| parent | 72f4202f1ff20edfcc34368488d5bd760fac57b6 (diff) | |
staging: comedi: ni_tio: convert NI_660x_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 | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c index 818519a72f76..1fb9a5c26a32 100644 --- a/drivers/staging/comedi/drivers/ni_tio.c +++ b/drivers/staging/comedi/drivers/ni_tio.c @@ -160,12 +160,7 @@ enum ni_660x_gate_select { }; static const unsigned ni_660x_max_gate_pin = 7; #define NI_660X_PIN_GATE_SEL(x) (0x2 + (x)) - -static inline unsigned NI_660x_RTSI_Gate_Select(unsigned n) -{ - BUG_ON(n > ni_660x_max_rtsi_channel); - return 0xb + n; -} +#define NI_660X_RTSI_GATE_SEL(x) (0xb + (x)) enum ni_m_series_gate_select { NI_M_Series_Timestamp_Mux_Gate_Select = 0x0, @@ -1215,7 +1210,7 @@ ni_660x_first_gate_to_generic_gate_source(unsigned ni_660x_gate_select) return NI_GPCT_LOGIC_LOW_GATE_SELECT; default: for (i = 0; i <= ni_660x_max_rtsi_channel; ++i) { - if (ni_660x_gate_select == NI_660x_RTSI_Gate_Select(i)) + if (ni_660x_gate_select == NI_660X_RTSI_GATE_SEL(i)) return NI_GPCT_RTSI_GATE_SELECT(i); } if (i <= ni_660x_max_rtsi_channel) |