iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: phy: use phy_modify_changed in genphy_config_advert

Browse Source 
Use phy_modify_changed() to simplify the code.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit
2019-02-10 19:59:57 +01:00
committed by David S. Miller
parent b06d8e5a5d
commit 4f9744ed3c
1 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/net/phy/phy_device.c
View File

@@ -1516,7 +1516,7 @@ EXPORT_SYMBOL(phy_reset_after_clk_enable);
static int genphy_config_advert(struct phy_device *phydev) static int genphy_config_advert(struct phy_device *phydev)
{ {
u32 advertise; u32 advertise;
int oldadv, adv, bmsr; int bmsr, adv;
int err, changed = 0; int err, changed = 0;
/* Only allow advertising what this PHY supports */ /* Only allow advertising what this PHY supports */
@@ -1529,22 +1529,14 @@ static int genphy_config_advert(struct phy_device *phydev)
phydev->advertising); phydev->advertising);
/* Setup standard advertisement */ /* Setup standard advertisement */
adv = phy_read(phydev, MII_ADVERTISE); err = phy_modify_changed(phydev, MII_ADVERTISE,
if (adv < 0) ADVERTISE_ALL | ADVERTISE_100BASE4 |
return adv; ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM,
ethtool_adv_to_mii_adv_t(advertise));
oldadv = adv;
adv &= ~(ADVERTISE_ALL | ADVERTISE_100BASE4 | ADVERTISE_PAUSE_CAP |
ADVERTISE_PAUSE_ASYM);
adv |= ethtool_adv_to_mii_adv_t(advertise);
if (adv != oldadv) {
err = phy_write(phydev, MII_ADVERTISE, adv);
if (err < 0) if (err < 0)
return err; return err;
if (err > 0)
changed = 1; changed = 1;
}
bmsr = phy_read(phydev, MII_BMSR); bmsr = phy_read(phydev, MII_BMSR);
if (bmsr < 0) if (bmsr < 0)
@@ -1558,25 +1550,20 @@ static int genphy_config_advert(struct phy_device *phydev)
return changed; return changed;
/* Configure gigabit if it's supported */ /* Configure gigabit if it's supported */
adv = phy_read(phydev, MII_CTRL1000); adv = 0;
if (adv < 0)
return adv;
oldadv = adv;
adv &= ~(ADVERTISE_1000FULL | ADVERTISE_1000HALF);
if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,
phydev->supported) || phydev->supported) ||
linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
phydev->supported)) phydev->supported))
adv |= ethtool_adv_to_mii_ctrl1000_t(advertise); adv = ethtool_adv_to_mii_ctrl1000_t(advertise);
if (adv != oldadv) err = phy_modify_changed(phydev, MII_CTRL1000,
changed = 1; ADVERTISE_1000FULL | ADVERTISE_1000HALF,
adv);
err = phy_write(phydev, MII_CTRL1000, adv);
if (err < 0) if (err < 0)
return err; return err;
if (err > 0)
changed = 1;
return changed; return changed;
} }