diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-07-24 10:14:42 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-27 11:16:47 -0700 |
| commit | e04460a650e10afb891b941c0a58545b1f2f5963 (patch) | |
| tree | 84a809b879158016be05238d19927410bfb37fb2 /drivers/staging | |
| parent | ff9a9861154e5f8cebeb981b86ee194cfef00ede (diff) | |
staging: comedi: ni_tio: convert NI_660x_Up_Down_Pin_Second_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 <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_tio.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c index 234761225081..247e3daadadb 100644 --- a/drivers/staging/comedi/drivers/ni_tio.c +++ b/drivers/staging/comedi/drivers/ni_tio.c @@ -186,12 +186,7 @@ enum ni_660x_second_gate_select { NI_660x_Logic_Low_Second_Gate_Select = 0x1f, }; static const unsigned ni_660x_max_up_down_pin = 7; -static inline unsigned NI_660x_Up_Down_Pin_Second_Gate_Select(unsigned n) -{ - BUG_ON(n > ni_660x_max_up_down_pin); - return 0x2 + n; -} - +#define NI_660X_UD_PIN_GATE2_SEL(x) (0x2 + (x)) #define NI_660X_RTSI_GATE2_SEL(x) (0xb + (x)) static const unsigned int counter_status_mask = @@ -1269,10 +1264,8 @@ ni_660x_second_gate_to_generic_gate_source(unsigned ni_660x_gate_select) if (i <= ni_660x_max_rtsi_channel) break; for (i = 0; i <= ni_660x_max_up_down_pin; ++i) { - if (ni_660x_gate_select == - NI_660x_Up_Down_Pin_Second_Gate_Select(i)) { + if (ni_660x_gate_select == NI_660X_UD_PIN_GATE2_SEL(i)) return NI_GPCT_UP_DOWN_PIN_GATE_SELECT(i); - } } if (i <= ni_660x_max_up_down_pin) break; |