diff options
| author | Dejin Zheng <zhengdejin5@gmail.com> | 2020-03-23 23:05:56 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-23 22:00:02 -0700 |
| commit | 8964a2174f91a87b0858e8fb3018eaf06eaa0ede (patch) | |
| tree | ade76a6379aae49b533913ec7c9601c73920780e /drivers/net/phy | |
| parent | 9c6464dcffa0ee42144c343f51aef3d26dbada05 (diff) | |
| download | linux-8964a2174f91a87b0858e8fb3018eaf06eaa0ede.tar.gz linux-8964a2174f91a87b0858e8fb3018eaf06eaa0ede.tar.bz2 linux-8964a2174f91a87b0858e8fb3018eaf06eaa0ede.zip | |
net: phy: marvell10g: use phy_read_mmd_poll_timeout() to simplify the code
use phy_read_mmd_poll_timeout() to replace the poll codes for
simplify mv3310_reset() function.
Suggested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/marvell10g.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index 7e05b92504f0..7621badae64d 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -241,22 +241,17 @@ static int mv3310_power_up(struct phy_device *phydev) static int mv3310_reset(struct phy_device *phydev, u32 unit) { - int retries, val, err; + int val, err; err = phy_modify_mmd(phydev, MDIO_MMD_PCS, unit + MDIO_CTRL1, MDIO_CTRL1_RESET, MDIO_CTRL1_RESET); if (err < 0) return err; - retries = 20; - do { - msleep(5); - val = phy_read_mmd(phydev, MDIO_MMD_PCS, unit + MDIO_CTRL1); - if (val < 0) - return val; - } while (val & MDIO_CTRL1_RESET && --retries); - - return val & MDIO_CTRL1_RESET ? -ETIMEDOUT : 0; + return phy_read_mmd_poll_timeout(phydev, MDIO_MMD_PCS, + unit + MDIO_CTRL1, val, + !(val & MDIO_CTRL1_RESET), + 5000, 100000, true); } static int mv3310_get_edpd(struct phy_device *phydev, u16 *edpd) |