mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: phy: use phy_resolve_aneg_linkmode in genphy_read_status

Browse source 
Now that we have phy_resolve_aneg_linkmode() we can make
genphy_read_status() much simpler.

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-14 22:16:27 +01:00 committed by David S. Miller
parent a2703de709
commit 5502b218e0
1 changed files with 1 additions and 23 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/net/phy/phy_device.c
View file

@ -1746,8 +1746,6 @@ int genphy_read_status(struct phy_device *phydev)
int err; int err;
int lpa; int lpa;
int lpagb = 0; int lpagb = 0;
int common_adv;
int common_adv_gb = 0;
/* Update the link, but return if there was an error */ /* Update the link, but return if there was an error */
err = genphy_update_link(phydev); err = genphy_update_link(phydev);
@ -1779,7 +1777,6 @@ int genphy_read_status(struct phy_device *phydev)
mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising,
lpagb); lpagb);
common_adv_gb = lpagb & adv << 2;
} }
lpa = phy_read(phydev, MII_LPA); lpa = phy_read(phydev, MII_LPA);
@ -1792,31 +1789,12 @@ int genphy_read_status(struct phy_device *phydev)
if (adv < 0) if (adv < 0)
return adv; return adv;
common_adv = lpa & adv;
phydev->speed = SPEED_10; phydev->speed = SPEED_10;
phydev->duplex = DUPLEX_HALF; phydev->duplex = DUPLEX_HALF;
phydev->pause = 0; phydev->pause = 0;
phydev->asym_pause = 0; phydev->asym_pause = 0;
if (common_adv_gb & (LPA_1000FULL | LPA_1000HALF)) { phy_resolve_aneg_linkmode(phydev);
phydev->speed = SPEED_1000;
if (common_adv_gb & LPA_1000FULL)
phydev->duplex = DUPLEX_FULL;
} else if (common_adv & (LPA_100FULL | LPA_100HALF)) {
phydev->speed = SPEED_100;
if (common_adv & LPA_100FULL)
phydev->duplex = DUPLEX_FULL;
} else
if (common_adv & LPA_10FULL)
phydev->duplex = DUPLEX_FULL;
if (phydev->duplex == DUPLEX_FULL) {
phydev->pause = lpa & LPA_PAUSE_CAP ? 1 : 0;
phydev->asym_pause = lpa & LPA_PAUSE_ASYM ? 1 : 0;
}
} else { } else {
int bmcr = phy_read(phydev, MII_BMCR); int bmcr = phy_read(phydev, MII_BMCR);