mirror of https://gitee.com/openkylin/linux.git
rt2x00: Use __builtin_choose_expr() instead of ?:
To really force the FIELD macros to determine the first bit of the register field we should use the __builtin_choose_expr() function. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
a26cbc6508
commit
4ae1168199
|
@ -145,23 +145,27 @@ struct rt2x00_field32 {
|
|||
* compile-time rather then run-time.
|
||||
*/
|
||||
#define compile_ffs2(__x) \
|
||||
( ((__x) & 0x1) ? 0 : 1 )
|
||||
__builtin_choose_expr(((__x) & 0x1), 0, 1)
|
||||
|
||||
#define compile_ffs4(__x) \
|
||||
( ((__x) & 0x3) ? \
|
||||
compile_ffs2(__x) : (compile_ffs2((__x) >> 2) + 2) )
|
||||
__builtin_choose_expr(((__x) & 0x3), \
|
||||
(compile_ffs2((__x))), \
|
||||
(compile_ffs2((__x) >> 2) + 2))
|
||||
|
||||
#define compile_ffs8(__x) \
|
||||
( ((__x) & 0xf) ? \
|
||||
compile_ffs4(__x) : (compile_ffs4((__x) >> 4) + 4) )
|
||||
__builtin_choose_expr(((__x) & 0xf), \
|
||||
(compile_ffs4((__x))), \
|
||||
(compile_ffs4((__x) >> 4) + 4))
|
||||
|
||||
#define compile_ffs16(__x) \
|
||||
( ((__x) & 0xff) ? \
|
||||
compile_ffs8(__x) : (compile_ffs8((__x) >> 8) + 8) )
|
||||
__builtin_choose_expr(((__x) & 0xff), \
|
||||
(compile_ffs8((__x))), \
|
||||
(compile_ffs8((__x) >> 8) + 8))
|
||||
|
||||
#define compile_ffs32(__x) \
|
||||
( ((__x) & 0xffff) ? \
|
||||
compile_ffs16(__x) : (compile_ffs16((__x) >> 16) + 16) )
|
||||
__builtin_choose_expr(((__x) & 0xffff), \
|
||||
(compile_ffs16((__x))), \
|
||||
(compile_ffs16((__x) >> 16) + 16))
|
||||
|
||||
/*
|
||||
* This macro will check the requirements for the FIELD{8,16,32} macros
|
||||
|
|
Loading…
Reference in New Issue