Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'regmap/fix/header' and 'regmap/fix/macro' into regmap-linus

Browse Source
This commit is contained in:
Mark Brown 2016-10-29 12:14:39 -06:00
commit 74e3368de8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/linux/regmap.h
View File

@ -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 {
#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