GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-28 17:41:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: phy: improve genphy_c45_read_link

Browse source 
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 <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit 2019-02-05 20:41:37 +01:00 • committed by David S. Miller
parent 7d8e249f39
commit a6e11f6bbd
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/phy/marvell10g.c
View file

@ -457,8 +457,6 @@ static int mv3310_read_status(struct phy_device *phydev)
if (val < 0) if (val < 0)
return val; return val;
phydev->link = val > 0 ? 1 : 0;
val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_STAT1); val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_STAT1);
if (val < 0) if (val < 0)
return val; return val;

15
drivers/net/phy/phy-c45.c
View file

@ -121,7 +121,7 @@ EXPORT_SYMBOL_GPL(genphy_c45_aneg_done);
* @mmd_mask: MMDs to read status from * @mmd_mask: MMDs to read status from
* *
* Read the link status from the specified MMDs, and if they all indicate * 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. * a negative errno will be returned, otherwise zero.
*/ */
int genphy_c45_read_link(struct phy_device *phydev, u32 mmd_mask) int genphy_c45_read_link(struct phy_device *phydev, u32 mmd_mask)
@ -129,7 +129,7 @@ int genphy_c45_read_link(struct phy_device *phydev, u32 mmd_mask)
int val, devad; int val, devad;
bool link = true; bool link = true;
while (mmd_mask) { while (mmd_mask && link) {
devad = __ffs(mmd_mask); devad = __ffs(mmd_mask);
mmd_mask &= ~BIT(devad); mmd_mask &= ~BIT(devad);
@ -145,7 +145,9 @@ int genphy_c45_read_link(struct phy_device *phydev, u32 mmd_mask)
link = false; link = false;
} }
return link; phydev->link = link;
return 0;
} }
EXPORT_SYMBOL_GPL(genphy_c45_read_link); EXPORT_SYMBOL_GPL(genphy_c45_read_link);
@ -265,7 +267,6 @@ EXPORT_SYMBOL_GPL(gen10g_config_aneg);
int gen10g_read_status(struct phy_device *phydev) int gen10g_read_status(struct phy_device *phydev)
{ {
u32 mmd_mask = phydev->c45_ids.devices_in_package; u32 mmd_mask = phydev->c45_ids.devices_in_package;
int ret;
/* For now just lie and say it's 10G all the time */ /* For now just lie and say it's 10G all the time */
phydev->speed = SPEED_10000; phydev->speed = SPEED_10000;
@ -274,11 +275,7 @@ int gen10g_read_status(struct phy_device *phydev)
/* Avoid reading the vendor MMDs */ /* Avoid reading the vendor MMDs */
mmd_mask &= ~(BIT(MDIO_MMD_VEND1) | BIT(MDIO_MMD_VEND2)); mmd_mask &= ~(BIT(MDIO_MMD_VEND1) | BIT(MDIO_MMD_VEND2));
ret = genphy_c45_read_link(phydev, mmd_mask); return genphy_c45_read_link(phydev, mmd_mask);
phydev->link = ret > 0 ? 1 : 0;
return 0;
} }
EXPORT_SYMBOL_GPL(gen10g_read_status); EXPORT_SYMBOL_GPL(gen10g_read_status);