AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-19 06:59:02 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

regmap: Avoid namespace collision within macro & tidy up

Browse Source 
Renamed variable "timeout" to "__timeout" & "pollret" to "__ret" to
avoid namespace collision. Tidy up macro arguments with parentheses.

Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ramesh Shanmugasundaram 2017-07-03 12:04:21 +01:00 committed by Mark Brown
parent 6f7da29041
commit 780b1350d3
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