diff options
| author | Dejin Zheng <zhengdejin5@gmail.com> | 2020-04-20 21:46:46 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-04-20 15:47:31 +0100 |
| commit | e44ab4e14d6f4c448ae555132090c1a116b19e5c (patch) | |
| tree | dfd25ca4d35115b5b7857989fe967f6f02a46f87 /include/linux/regmap.h | |
| parent | 3ada1b176e6b91c0a807e02274437ff0c01d155a (diff) | |
| download | lwn-e44ab4e14d6f4c448ae555132090c1a116b19e5c.tar.gz lwn-e44ab4e14d6f4c448ae555132090c1a116b19e5c.zip | |
regmap: Simplify implementation of the regmap_read_poll_timeout() macro
Simplify the implementation of the macro regmap_read_poll_timeout()
by using the macro read_poll_timeout().
Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
Link: https://lore.kernel.org/r/20200420134647.9121-2-zhengdejin5@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/linux/regmap.h')
| -rw-r--r-- | include/linux/regmap.h | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 91420af1c30d..b50e930a9c18 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -17,6 +17,7 @@ #include <linux/err.h> #include <linux/bug.h> #include <linux/lockdep.h> +#include <linux/iopoll.h> struct module; struct clk; @@ -130,26 +131,10 @@ struct reg_sequence { */ #define regmap_read_poll_timeout(map, addr, val, cond, sleep_us, timeout_us) \ ({ \ - u64 __timeout_us = (timeout_us); \ - unsigned long __sleep_us = (sleep_us); \ - ktime_t __timeout = ktime_add_us(ktime_get(), __timeout_us); \ - int __ret; \ - might_sleep_if(__sleep_us); \ - for (;;) { \ - __ret = regmap_read((map), (addr), &(val)); \ - if (__ret) \ - break; \ - if (cond) \ - break; \ - 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); \ - } \ - __ret ?: ((cond) ? 0 : -ETIMEDOUT); \ + int __ret, __tmp; \ + __tmp = read_poll_timeout(regmap_read, __ret, __ret || (cond), \ + sleep_us, timeout_us, false, (map), (addr), &(val)); \ + __ret ?: __tmp; \ }) /** |