Hi Mark, The readx_poll_timeout & similar macros defines local variable that can cause name space collision with the caller. Fixed this issue by prefixing them with underscores. Also tidied couple of instances where the macro arguments are used in expressions without parentheses. This patchset is based on top of today's linux-next repo. commit b18ea5c46031 ("Add linux-next specific files for 20170703") Change history: v3: - Rebased - Corrected parentheses spelling v2: - iopoll.h: - Enclosed timeout_us & sleep_us arguments with parentheses - regmap.h: - Enclosed timeout_us & sleep_us arguments with parentheses - Renamed pollret to __ret Note: timeout_us causes a spare check warning as identified here [1]. [1] https://www.mail-archive.com/linux-renesas-soc@xxxxxxxxxxxxxxx/msg15138.html Thanks, Ramesh Ramesh Shanmugasundaram (2): iopoll: Avoid namespace collision within macros & tidy up regmap: Avoid namespace collision within macro & tidy up include/linux/iopoll.h | 12 +++++++----- include/linux/regmap.h | 17 +++++++++-------- 2 files changed, 16 insertions(+), 13 deletions(-) -- 2.12.2