[PATCH 1/2] iopoll: Avoid namespace collision within macros

From: Ramesh Shanmugasundaram
Date: Thu Oct 27 2016 - 10:32:06 EST


Renamed variable "timeout" to "__timeout" to avoid namespace collision.

Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@xxxxxxxxxxxxxx>
---
include/linux/iopoll.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h
index 1c30014..e237d01 100644
--- a/include/linux/iopoll.h
+++ b/include/linux/iopoll.h
@@ -42,13 +42,13 @@
*/
#define readx_poll_timeout(op, addr, val, cond, sleep_us, timeout_us) \
({ \
- ktime_t timeout = ktime_add_us(ktime_get(), timeout_us); \
+ ktime_t __timeout = ktime_add_us(ktime_get(), timeout_us); \
might_sleep_if(sleep_us); \
for (;;) { \
(val) = op(addr); \
if (cond) \
break; \
- if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \
+ if (timeout_us && ktime_compare(ktime_get(), __timeout) > 0) { \
(val) = op(addr); \
break; \
} \
@@ -77,12 +77,12 @@
*/
#define readx_poll_timeout_atomic(op, addr, val, cond, delay_us, timeout_us) \
({ \
- ktime_t timeout = ktime_add_us(ktime_get(), timeout_us); \
+ ktime_t __timeout = ktime_add_us(ktime_get(), timeout_us); \
for (;;) { \
(val) = op(addr); \
if (cond) \
break; \
- if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \
+ if (timeout_us && ktime_compare(ktime_get(), __timeout) > 0) { \
(val) = op(addr); \
break; \
} \
--
1.9.1