UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'topic/namespace' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-core

This commit is contained in:
Mark Brown 2017-10-13 18:21:06 +01:00
parent 2bd6bf03f4 780b1350d3
commit 07d1346419
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/linux/regmap.h
View File

@ -120,23 +120,24 @@ 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 pollret; \ int __ret; \
might_sleep_if(sleep_us); \ might_sleep_if(sleep_us); \
for (;;) { \ for (;;) { \
pollret = regmap_read((map), (addr), &(val)); \ __ret = regmap_read((map), (addr), &(val)); \
if (pollret) \ if (__ret) \
break; \ break; \
if (cond) \ if (cond) \
break; \ break; \
if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \ if ((timeout_us) && \
pollret = regmap_read((map), (addr), &(val)); \ ktime_compare(ktime_get(), __timeout) > 0) { \
__ret = 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); \
} \ } \
pollret ?: ((cond) ? 0 : -ETIMEDOUT); \ __ret ?: ((cond) ? 0 : -ETIMEDOUT); \
}) })
#ifdef CONFIG_REGMAP #ifdef CONFIG_REGMAP