[PATCH 2/2] regmap: Avoid namespace collision within macro

[Ramesh Shanmugasundaram]

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

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

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 9adc7b2..32f339a 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -115,7 +115,7 @@ struct reg_sequence {
  */
 #define regmap_read_poll_timeout(map, 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); \
        int ret; \
        might_sleep_if(sleep_us); \
        for (;;) { \
@@ -124,7 +124,7 @@ struct reg_sequence {
                        break; \
                if (cond) \
                        break; \
-               if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \
+               if (timeout_us && ktime_compare(ktime_get(), __timeout) > 0) { \
                        ret = regmap_read((map), (addr), &(val)); \
                        break; \
                } \
-- 
1.9.1