diff options
| author |   Dejin Zheng <zhengdejin5@gmail.com> | 2020-03-23 23:05:59 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-03-23 22:00:02 -0700 |
| commit | 7ae7ad2f11ef476b5e92f1d7dc4c5dd9194c4d5f (patch) | |
| tree | 82ff020befd1fe1405bf25c97e5986c059b05b06 | |
| parent | net: phy: use phy_read_poll_timeout() to simplify the code (diff) | |
| download | wireguard-linux-7ae7ad2f11ef476b5e92f1d7dc4c5dd9194c4d5f.tar.xz wireguard-linux-7ae7ad2f11ef476b5e92f1d7dc4c5dd9194c4d5f.zip | |
net: phy: smsc: use phy_read_poll_timeout() to simplify the code
use phy_read_poll_timeout() to replace the poll codes for
simplify lan87xx_read_status() function.
Suggested-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/smsc.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index b73298250793..93da7d3d0954 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,11 @@ 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; - } + phy_read_poll_timeout(phydev, MII_LAN83C185_CTRL_STATUS, rc, + rc & MII_LAN83C185_ENERGYON, 10000, + 640000, true); + if (rc < 0) + return rc; /* Re-enable EDPD */ rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS); |