Messages in this thread Patch in this message | | | From | Dejin Zheng <> | Subject | [PATCH net-next 7/7] net: phy: use phy_read_poll_timeout() to simplify the code | Date | Fri, 20 Mar 2020 00:39:10 +0800 |
| |
use phy_read_poll_timeout() to replace the poll codes for simplify the code in phy_poll_reset() function.
Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com> --- drivers/net/phy/phy_device.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index a585faf8b844..bdef427593c9 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1059,23 +1059,17 @@ EXPORT_SYMBOL(phy_disconnect); static int phy_poll_reset(struct phy_device *phydev) { /* Poll until the reset bit clears (50ms per retry == 0.6 sec) */ - unsigned int retries = 12; - int ret; - - do { - msleep(50); - ret = phy_read(phydev, MII_BMCR); - if (ret < 0) - return ret; - } while (ret & BMCR_RESET && --retries); - if (ret & BMCR_RESET) - return -ETIMEDOUT; + int ret, val; + ret = phy_read_poll_timeout(val, val < 0 || !(val & BMCR_RESET), + 50000, 600000, phydev, MII_BMCR); + if (val < 0) + ret = val; /* Some chips (smsc911x) may still need up to another 1ms after the * BMCR_RESET bit is cleared before they are usable. */ msleep(1); - return 0; + return ret; } int phy_init_hw(struct phy_device *phydev) -- 2.25.0
| |