treewide: Convert macro and uses of __section(foo) to __section("foo")

[platform/kernel/u-boot.git] / include / linux / iopoll.h

diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h
index 31c55ae..30cdea0 100644 (file)
--- a/include/linux/iopoll.h
+++ b/include/linux/iopoll.h
@@ -1,22 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
- *
- * SPDX-License-Identifier:    GPL-2.0
  */
 
 #ifndef _LINUX_IOPOLL_H
 #define _LINUX_IOPOLL_H
 
+#include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <time.h>
 
 /**
- * readx_poll_timeout - Periodically poll an address until a condition is met or a timeout occurs
+ * 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
  *
  * Returns 0 on success and -ETIMEDOUT upon a timeout. In either
@@ -25,7 +26,7 @@
  * When available, you'll probably want to use one of the specialized
  * macros defined below rather than this macro directly.
  */
-#define readx_poll_timeout(op, addr, val, cond, timeout_us)    \
+#define read_poll_timeout(op, addr, val, cond, sleep_us, timeout_us)   \
 ({ \
        unsigned long timeout = timer_get_us() + timeout_us; \
        for (;;) { \
@@ -36,10 +37,20 @@
                        (val) = op(addr); \
                        break; \
                } \
+               if (sleep_us) \
+                       udelay(sleep_us); \
        } \
        (cond) ? 0 : -ETIMEDOUT; \
 })
 
+#define readx_poll_sleep_timeout(op, addr, val, cond, sleep_us, timeout_us) \
+       read_poll_timeout(op, addr, val, cond, sleep_us, timeout_us)
+
+#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)
 
 #define readb_poll_timeout(addr, val, cond, timeout_us) \
        readx_poll_timeout(readb, addr, val, cond, timeout_us)