Fix:
ERROR: Macros with complex values should be enclosed in parenthesis

by unwinding the problematic macros.
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>