Commit 80a306d6 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regmap-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

Pull regmap fixes from Mark Brown:
 "A couple of small build fixes here, nothing major.

  The missing include is triggered in some configurations and the
  renaming of ret is defensive for the benefit of some drivers people
  are in the process of mainlining"

* tag 'regmap-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: Rename ret variable in regmap_read_poll_timeout
  regmap: include <linux/delay.h> from include/linux/regmap.h
parents 6eb3c604 74e3368d
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/rbtree.h> #include <linux/rbtree.h>
#include <linux/delay.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/lockdep.h> #include <linux/lockdep.h>
...@@ -116,22 +117,22 @@ struct reg_sequence { ...@@ -116,22 +117,22 @@ struct reg_sequence {
#define regmap_read_poll_timeout(map, addr, val, cond, sleep_us, timeout_us) \ #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; \ int pollret; \
might_sleep_if(sleep_us); \ might_sleep_if(sleep_us); \
for (;;) { \ for (;;) { \
ret = regmap_read((map), (addr), &(val)); \ pollret = regmap_read((map), (addr), &(val)); \
if (ret) \ if (pollret) \
break; \ break; \
if (cond) \ if (cond) \
break; \ 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)); \ pollret = regmap_read((map), (addr), &(val)); \
break; \ break; \
} \ } \
if (sleep_us) \ if (sleep_us) \
usleep_range((sleep_us >> 2) + 1, sleep_us); \ usleep_range((sleep_us >> 2) + 1, sleep_us); \
} \ } \
ret ?: ((cond) ? 0 : -ETIMEDOUT); \ pollret ?: ((cond) ? 0 : -ETIMEDOUT); \
}) })
#ifdef CONFIG_REGMAP #ifdef CONFIG_REGMAP
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment