net: phy: improve genphy_c45_read_link
Subsystems (4)
Heiner Kallweit
maintainerPATCH v2 1/1 net: phy: improve genphy_c45_read_link
Let's make genphy_c45_read_link behave the same as genphy_update_link and set phydev->link in the function directly. This allows to simplify the callers. In addition don't check further devices once we detect that at least one device reports link as down.
v2:
- remove an unused variable
Signed-off-by Heiner Kallweit <[email protected]>
--- drivers/net/phy/marvell10g.c | 2 -- drivers/net/phy/phy-c45.c | 15 ++++++--------- 2 files changed, 6 insertions(+), 11 deletions(-)
drivers/net/phy/marvell10g.c +0 -2
@@ -475,8 +475,6 @@ static int mv3310_read_status(struct phy_device *phydev)if (val <0 )return val; - phydev->link = val >0 ?1 :0 ; - val =phy_read_mmd (phydev,MDIO_MMD_AN ,MDIO_STAT1 );if (val <0 )return val;
drivers/net/phy/phy-c45.c +6 -9
@@ -134,7 +134,7 @@ EXPORT_SYMBOL_GPL(genphy_c45_aneg_done);* @mmd_mask: MMDs to read status from * * Read the link status from the specified MMDs, and if they all indicate -* that the link is up, return positive. If an error is encountered, +* that the link is up, set phydev->link to 1. If an error is encountered, * a negative errno will be returned, otherwise zero. */ int genphy_c45_read_link (struct phy_device *phydev,u32 mmd_mask)
@@ -142,7 +142,7 @@ int genphy_c45_read_link(struct phy_device *phydev, u32 mmd_mask)int val, devad;bool link = true; -while (mmd_mask) { +while (mmd_mask && link) { devad =__ffs (mmd_mask); mmd_mask &= ~BIT (devad);
@@ -158,7 +158,9 @@ int genphy_c45_read_link(struct phy_device *phydev, u32 mmd_mask) link = false; } -return link; + phydev->link = link; + +return 0 ; }EXPORT_SYMBOL_GPL (genphy_c45_read_link);
@@ -278,7 +280,6 @@ EXPORT_SYMBOL_GPL(gen10g_config_aneg);int gen10g_read_status (struct phy_device *phydev) {u32 mmd_mask = phydev->c45_ids.devices_in_package; -int ret;/* For now just lie and say it's 10G all the time */ phydev->speed =SPEED_10000 ;
@@ -287,11 +288,7 @@ int gen10g_read_status(struct phy_device *phydev)/* Avoid reading the vendor MMDs */ mmd_mask &= ~(BIT (MDIO_MMD_VEND1 ) |BIT (MDIO_MMD_VEND2 )); - ret =genphy_c45_read_link (phydev, mmd_mask); - - phydev->link = ret >0 ?1 :0 ; - -return 0 ; +return genphy_c45_read_link (phydev, mmd_mask); }EXPORT_SYMBOL_GPL (gen10g_read_status);
Signature · 1 line
2.20.1
From: Heiner Kallweit <[email protected]>
Date: Tue, 5 Feb 2019 20:41:37 +0100
Quoted 9 lines
Let's make
genphy_c45_read_linkbehave the same asgenphy_update_linkand setphydev->linkin the function directly. This allows to simplify the callers. In addition don't check further devices once we detect that at least one device reports link as down.v2:
- remove an unused variableSigned-off-by Heiner Kallweit <[email protected]>
Applied, thanks Heiner.