Commit 745a237c authored by Dejin Zheng's avatar Dejin Zheng Committed by David S. Miller
Browse files

net: phy: use phy_read_poll_timeout() to simplify the code 



use phy_read_poll_timeout() to replace the poll codes for
simplify the code in phy_poll_reset() function.

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDejin Zheng <zhengdejin5@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fcbd30d0

drivers/net/phy/phy_device.c

+5 −11
Original line number Diff line number Diff line
@@ -1059,18 +1059,12 @@ 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;

	int ret, val;



	do {

		msleep(50);

		ret = phy_read(phydev, MII_BMCR);

		if (ret < 0)

	ret = phy_read_poll_timeout(phydev, MII_BMCR, val, !(val & BMCR_RESET),

				    50000, 600000, true);

	if (ret)

		return ret;

	} while (ret & BMCR_RESET && --retries);

	if (ret & BMCR_RESET)

		return -ETIMEDOUT;



	/* Some chips (smsc911x) may still need up to another 1ms after the

	 * BMCR_RESET bit is cleared before they are usable.

	 */