From: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
To: mattw@codeaurora.org, mitchelh@codeaurora.org,
broonie@kernel.org, linux-kernel@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org, chris.paterson2@renesas.com,
Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
Subject: [PATCH 1/2] iopoll: Avoid namespace collision within macros
Date: Thu, 27 Oct 2016 10:33:18 +0100 [thread overview]
Message-ID: <1477560799-58896-2-git-send-email-ramesh.shanmugasundaram@bp.renesas.com> (raw)
In-Reply-To: <1477560799-58896-1-git-send-email-ramesh.shanmugasundaram@bp.renesas.com>
Renamed variable "timeout" to "__timeout" to avoid namespace collision.
Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
---
include/linux/iopoll.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h
index 1c30014..e237d01 100644
--- a/include/linux/iopoll.h
+++ b/include/linux/iopoll.h
@@ -42,13 +42,13 @@
*/
#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; \
} \
@@ -77,12 +77,12 @@
*/
#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; \
} \
--
1.9.1
next prev parent reply other threads:[~2016-10-27 14:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-27 9:33 [PATCH 0/2] Avoid namespace collision within macros Ramesh Shanmugasundaram
2016-10-27 9:33 ` Ramesh Shanmugasundaram [this message]
2016-10-27 9:33 ` [PATCH 2/2] regmap: Avoid namespace collision within macro Ramesh Shanmugasundaram
2016-10-27 10:15 ` Mark Brown
2016-10-27 10:22 ` Ramesh Shanmugasundaram
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477560799-58896-2-git-send-email-ramesh.shanmugasundaram@bp.renesas.com \
--to=ramesh.shanmugasundaram@bp.renesas.com \
--cc=broonie@kernel.org \
--cc=chris.paterson2@renesas.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=mattw@codeaurora.org \
--cc=mitchelh@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).