From: Dejin Zheng <zhengdejin5@gmail.com>
To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com,
linux@armlinux.org.uk, davem@davemloft.net, corbet@lwn.net,
tglx@linutronix.de, gregkh@linuxfoundation.org,
allison@lohutok.net, mchehab+samsung@kernel.org,
netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Dejin Zheng <zhengdejin5@gmail.com>
Subject: [PATCH net-next v7 02/10] iopoll: redefined readx_poll_timeout macro to simplify the code
Date: Mon, 23 Mar 2020 23:05:52 +0800 [thread overview]
Message-ID: <20200323150600.21382-3-zhengdejin5@gmail.com> (raw)
In-Reply-To: <20200323150600.21382-1-zhengdejin5@gmail.com>
redefined readx_poll_timeout macro by read_poll_timeout to
simplify the code.
Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
---
v6 -> v7:
- adapt to a newly added parameter sleep_before_read.
v5 -> v6:
- no changed
v4 -> v5:
- no changed
v3 -> v4:
- no changed
v2 -> v3:
- no changed
v1 -> v2:
- no changed
include/linux/iopoll.h | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h
index 70f89b389648..cb20c733b15a 100644
--- a/include/linux/iopoll.h
+++ b/include/linux/iopoll.h
@@ -76,25 +76,7 @@
* macros defined below rather than this macro directly.
*/
#define readx_poll_timeout(op, addr, val, cond, sleep_us, timeout_us) \
-({ \
- u64 __timeout_us = (timeout_us); \
- unsigned long __sleep_us = (sleep_us); \
- ktime_t __timeout = ktime_add_us(ktime_get(), __timeout_us); \
- might_sleep_if((__sleep_us) != 0); \
- for (;;) { \
- (val) = op(addr); \
- if (cond) \
- break; \
- if (__timeout_us && \
- ktime_compare(ktime_get(), __timeout) > 0) { \
- (val) = op(addr); \
- break; \
- } \
- if (__sleep_us) \
- usleep_range((__sleep_us >> 2) + 1, __sleep_us); \
- } \
- (cond) ? 0 : -ETIMEDOUT; \
-})
+ read_poll_timeout(op, val, cond, sleep_us, timeout_us, false, addr)
/**
* readx_poll_timeout_atomic - Periodically poll an address until a condition is met or a timeout occurs
--
2.25.0
next prev parent reply other threads:[~2020-03-23 15:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 15:05 [PATCH net-next v7 00/10] introduce read_poll_timeout Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 01/10] iopoll: introduce read_poll_timeout macro Dejin Zheng
2020-03-23 15:05 ` Dejin Zheng [this message]
2020-03-23 15:05 ` [PATCH net-next v7 03/10] net: phy: introduce phy_read_mmd_poll_timeout macro Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 04/10] net: phy: bcm84881: use phy_read_mmd_poll_timeout() to simplify the code Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 05/10] net: phy: aquantia: " Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 06/10] net: phy: marvell10g: " Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 07/10] net: phy: introduce phy_read_poll_timeout macro Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 08/10] net: phy: use phy_read_poll_timeout() to simplify the code Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 09/10] net: phy: smsc: " Dejin Zheng
2020-06-01 19:05 ` Kevin Groeneveld
[not found] ` <CABF+-6W-yo=CzaMaASdRGm5TS-JCnC5kGwPZHMce9OLPDCUw-g@mail.gmail.com>
2020-06-02 16:30 ` Dejin Zheng
2020-03-23 15:06 ` [PATCH net-next v7 10/10] net: phy: tja11xx: " Dejin Zheng
2020-03-24 5:00 ` [PATCH net-next v7 00/10] introduce read_poll_timeout David Miller
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=20200323150600.21382-3-zhengdejin5@gmail.com \
--to=zhengdejin5@gmail.com \
--cc=allison@lohutok.net \
--cc=andrew@lunn.ch \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mchehab+samsung@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tglx@linutronix.de \
/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
all inboxes | Powered by JetHome®