diff options
| author |   Mark Brown <broonie@kernel.org> | 2017-10-13 18:21:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-10-13 18:21:06 +0100 |
| commit | 07d1346419941740cd59c8b688f02996c5aecc5b (patch) | |
| tree | 002df96606df2e9315a55903093032dd274de314 /include/linux/regmap.h | |
| parent | Linux 4.14-rc1 (diff) | |
| parent | regmap: Avoid namespace collision within macro & tidy up (diff) | |
| download | linux-dev-07d1346419941740cd59c8b688f02996c5aecc5b.tar.xz linux-dev-07d1346419941740cd59c8b688f02996c5aecc5b.zip | |
Merge branch 'topic/namespace' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-core
Diffstat (limited to 'include/linux/regmap.h')
| -rw-r--r-- | include/linux/regmap.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 978abfbac617..1474ab0a3922 100644 --- 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 |