From: Dejin Zheng <zhengdejin5@gmail.com>
To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com,
linux@armlinux.org.uk, davem@davemloft.net,
mchehab+samsung@kernel.org, corbet@lwn.net,
gregkh@linuxfoundation.org, broonie@kernel.org,
tglx@linutronix.de, netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Dejin Zheng <zhengdejin5@gmail.com>
Subject: [PATCH net-next v5 09/10] net: phy: smsc: use phy_read_poll_timeout() to simplify the code
Date: Mon, 23 Mar 2020 01:49:42 +0800 [thread overview]
Message-ID: <20200322174943.26332-10-zhengdejin5@gmail.com> (raw)
In-Reply-To: <20200322174943.26332-1-zhengdejin5@gmail.com>
use phy_read_poll_timeout() to replace the poll codes for
simplify lan87xx_read_status() function.
it should be add msleep(10) before call phy_read_poll_timeout()
to keep the code more similar, but it will report that warning, so
modify it to msleep(20).
./scripts/checkpatch.pl
v5-0009-net-phy-smsc-use-phy_read_poll_timeout-to-simplif.patch
WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.rst
#42: FILE: drivers/net/phy/smsc.c:126:
+ msleep(10);
Suggested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
---
v4 -> v5:
- add msleep before phy_read_poll_timeout() to keep the
code more similar
v3 -> v4:
- add this patch by Andrew's suggestion. Thanks Andrew!
drivers/net/phy/smsc.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index b73298250793..f888523086ed 100644
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -112,8 +112,6 @@ static int lan87xx_read_status(struct phy_device *phydev)
int err = genphy_read_status(phydev);
if (!phydev->link && priv->energy_enable) {
- int i;
-
/* Disable EDPD to wake up PHY */
int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
if (rc < 0)
@@ -125,15 +123,12 @@ static int lan87xx_read_status(struct phy_device *phydev)
return rc;
/* Wait max 640 ms to detect energy */
- for (i = 0; i < 64; i++) {
- /* Sleep to allow link test pulses to be sent */
- msleep(10);
- rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
- if (rc < 0)
- return rc;
- if (rc & MII_LAN83C185_ENERGYON)
- break;
- }
+ msleep(20);
+ phy_read_poll_timeout(phydev, MII_LAN83C185_CTRL_STATUS, rc,
+ rc & MII_LAN83C185_ENERGYON, 10000,
+ 620000);
+ if (rc < 0)
+ return rc;
/* Re-enable EDPD */
rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
--
2.25.0
next prev parent reply other threads:[~2020-03-22 17:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-22 17:49 [PATCH net-next v5 00/10] introduce read_poll_timeout Dejin Zheng
2020-03-22 17:49 ` [PATCH net-next v5 01/10] iopoll: introduce read_poll_timeout macro Dejin Zheng
2020-03-22 17:49 ` [PATCH net-next v5 02/10] iopoll: redefined readx_poll_timeout macro to simplify the code Dejin Zheng
2020-03-22 17:49 ` [PATCH net-next v5 03/10] net: phy: introduce phy_read_mmd_poll_timeout macro Dejin Zheng
2020-03-22 17:49 ` [PATCH net-next v5 04/10] net: phy: bcm84881: use phy_read_mmd_poll_timeout() to simplify the code Dejin Zheng
2020-03-22 17:49 ` [PATCH net-next v5 05/10] net: phy: aquantia: " Dejin Zheng
2020-03-22 17:49 ` [PATCH net-next v5 06/10] net: phy: marvell10g: " Dejin Zheng
2020-03-22 17:49 ` [PATCH net-next v5 07/10] net: phy: introduce phy_read_poll_timeout macro Dejin Zheng
2020-03-22 17:49 ` [PATCH net-next v5 08/10] net: phy: use phy_read_poll_timeout() to simplify the code Dejin Zheng
2020-03-22 19:05 ` Andrew Lunn
2020-03-22 19:18 ` Russell King - ARM Linux admin
2020-03-22 17:49 ` Dejin Zheng [this message]
2020-03-22 17:49 ` [PATCH net-next v5 10/10] net: phy: tja11xx: " Dejin Zheng
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=20200322174943.26332-10-zhengdejin5@gmail.com \
--to=zhengdejin5@gmail.com \
--cc=andrew@lunn.ch \
--cc=broonie@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).