[PATCH v3 1/2] iopoll: Avoid namespace collision within macros & tidy up

[Ramesh Shanmugasundaram]

Renamed variable "timeout" to "__timeout" to avoid namespace collision.
Tidy up macro arguments with parentheses.

Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasunda...@bp.renesas.com>
---
 include/linux/iopoll.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h
index d29e1e21bf3f..e000172bee54 100644
--- a/include/linux/iopoll.h
+++ b/include/linux/iopoll.h
@@ -42,18 +42,19 @@
  */
 #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; \
                } \
                if (sleep_us) \
-                       usleep_range((sleep_us >> 2) + 1, sleep_us); \
+                       usleep_range(((sleep_us) >> 2) + 1, sleep_us); \
        } \
        (cond) ? 0 : -ETIMEDOUT; \
 })
@@ -77,12 +78,13 @@
  */
 #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; \
                } \
-- 
2.12.2