Merge branch 'topic/namespace' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 978abfbac61783091046d63dbe23aedd2ad82b3c..1474ab0a39224a7d125207a5f72fbd31ffe20be0 100644 (file)
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -120,23 +120,24 @@ 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); \
-       int pollret; \
+       ktime_t __timeout = ktime_add_us(ktime_get(), timeout_us); \
+       int __ret; \
        might_sleep_if(sleep_us); \
        for (;;) { \
-               pollret = regmap_read((map), (addr), &(val)); \
-               if (pollret) \
+               __ret = regmap_read((map), (addr), &(val)); \
+               if (__ret) \
                        break; \
                if (cond) \
                        break; \
-               if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \
-                       pollret = regmap_read((map), (addr), &(val)); \
+               if ((timeout_us) && \
+                   ktime_compare(ktime_get(), __timeout) > 0) { \
+                       __ret = regmap_read((map), (addr), &(val)); \
                        break; \
                } \
                if (sleep_us) \
-                       usleep_range((sleep_us >> 2) + 1, sleep_us); \
+                       usleep_range(((sleep_us) >> 2) + 1, sleep_us); \
        } \
-       pollret ?: ((cond) ? 0 : -ETIMEDOUT); \
+       __ret ?: ((cond) ? 0 : -ETIMEDOUT); \
 })
 
 #ifdef CONFIG_REGMAP