Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1664868
| From | Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 1/2] iopoll: Avoid namespace collision within macros & tidyup |
| Date | 2017-06-13 15:50 +0200 |
| Message-ID | <tRUmK-ap-39@gated-at.bofh.it> (permalink) |
| References | <tRUmJ-ap-1@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Renamed variable "timeout" to "__timeout" to avoid namespace collision.
Tidy up macro arguments with paranthesis.
Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
---
include/linux/iopoll.h | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h
index d29e1e21bf3f..e000172bee54 100644
--- a/include/linux/iopoll.h
+++ b/include/linux/iopoll.h
@@ -42,18 +42,19 @@
*/
#define readx_poll_timeout(op, 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); \
might_sleep_if(sleep_us); \
for (;;) { \
(val) = op(addr); \
if (cond) \
break; \
- if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \
+ if ((timeout_us) && \
+ ktime_compare(ktime_get(), __timeout) > 0) { \
(val) = op(addr); \
break; \
} \
if (sleep_us) \
- usleep_range((sleep_us >> 2) + 1, sleep_us); \
+ usleep_range(((sleep_us) >> 2) + 1, sleep_us); \
} \
(cond) ? 0 : -ETIMEDOUT; \
})
@@ -77,12 +78,13 @@
*/
#define readx_poll_timeout_atomic(op, addr, val, cond, delay_us, timeout_us) \
({ \
- ktime_t timeout = ktime_add_us(ktime_get(), timeout_us); \
+ ktime_t __timeout = ktime_add_us(ktime_get(), timeout_us); \
for (;;) { \
(val) = op(addr); \
if (cond) \
break; \
- if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \
+ if ((timeout_us) && \
+ ktime_compare(ktime_get(), __timeout) > 0) { \
(val) = op(addr); \
break; \
} \
--
2.12.2
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 0/2] Avoid namespace collision within macros & tidyup Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> - 2017-06-13 15:50 +0200
[PATCH v2 2/2] regmap: Avoid namespace collision within macro & tidyup Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> - 2017-06-13 15:50 +0200
[PATCH v2 1/2] iopoll: Avoid namespace collision within macros & tidyup Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> - 2017-06-13 15:50 +0200
Re: [PATCH v2 1/2] iopoll: Avoid namespace collision within macros & tidyup Geert Uytterhoeven <geert@linux-m68k.org> - 2017-06-13 16:20 +0200
Re: [PATCH v2 0/2] Avoid namespace collision within macros & tidyup Ian Arkver <ian.arkver.dev@gmail.com> - 2017-06-14 08:50 +0200
RE: [PATCH v2 0/2] Avoid namespace collision within macros & tidyup Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> - 2017-06-14 09:20 +0200
Re: [PATCH v2 0/2] Avoid namespace collision within macros & tidyup Ian Arkver <ian.arkver.dev@gmail.com> - 2017-06-14 09:30 +0200
csiph-web