summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAriel D'Alessandro <ariel.dalessandro@collabora.com>2022-04-12 16:31:35 +0300
committerStefano Babic <sbabic@denx.de>2022-04-12 20:10:44 +0300
commitd7db0e6df3e42a5d47bac4d3b7a9e6c13ac08ec9 (patch)
treedb5cee4c187a18a913b3c72b815e810e6733faf2 /include
parent01c67a381c3e7dc70ad75b4d69ae3c82dff5afa8 (diff)
downloadu-boot-d7db0e6df3e42a5d47bac4d3b7a9e6c13ac08ec9.tar.xz
iopoll: Extend read_poll_timeout macro to support variable parameters
This macro currently supports only one parameter. Based on Linux iopoll, let's extend read_poll_timeout common API to allow multiple variable parameters. Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/iopoll.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h
index 30cdea0cdc..0ee2bddaa8 100644
--- a/include/linux/iopoll.h
+++ b/include/linux/iopoll.h
@@ -14,11 +14,11 @@
/**
* read_poll_timeout - Periodically poll an address until a condition is met or a timeout occurs
* @op: accessor function (takes @addr as its only argument)
- * @addr: Address to poll
* @val: Variable to read the value into
* @cond: Break condition (usually involving @val)
* @sleep_us: Maximum time to sleep in us
* @timeout_us: Timeout in us, 0 means never timeout
+ * @args: arguments for @op poll
*
* Returns 0 on success and -ETIMEDOUT upon a timeout. In either
* case, the last read value at @addr is stored in @val.
@@ -26,15 +26,15 @@
* When available, you'll probably want to use one of the specialized
* macros defined below rather than this macro directly.
*/
-#define read_poll_timeout(op, addr, val, cond, sleep_us, timeout_us) \
+#define read_poll_timeout(op, val, cond, sleep_us, timeout_us, args...) \
({ \
unsigned long timeout = timer_get_us() + timeout_us; \
for (;;) { \
- (val) = op(addr); \
+ (val) = op(args); \
if (cond) \
break; \
if (timeout_us && time_after(timer_get_us(), timeout)) { \
- (val) = op(addr); \
+ (val) = op(args); \
break; \
} \
if (sleep_us) \
@@ -44,13 +44,13 @@
})
#define readx_poll_sleep_timeout(op, addr, val, cond, sleep_us, timeout_us) \
- read_poll_timeout(op, addr, val, cond, sleep_us, timeout_us)
+ read_poll_timeout(op, val, cond, sleep_us, timeout_us, addr)
#define readl_poll_sleep_timeout(addr, val, cond, sleep_us, timeout_us) \
readx_poll_sleep_timeout(readl, addr, val, cond, sleep_us, timeout_us)
#define readx_poll_timeout(op, addr, val, cond, timeout_us) \
- read_poll_timeout(op, addr, val, cond, false, timeout_us)
+ read_poll_timeout(op, val, cond, false, timeout_us, addr)
#define readb_poll_timeout(addr, val, cond, timeout_us) \
readx_poll_timeout(readb, addr, val, cond, timeout_us)