p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: phy: aquantia: simplify aqr_config_aneg 

Simplify aqr_config_aneg().

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-03-23 14:35:20 +01:00 committed by David S. Miller
parent be67101fbf
commit 9675db398b
1 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/net/phy/aquantia_main.c
View File

@ -126,41 +126,22 @@ static int aqr_config_aneg(struct phy_device *phydev)
static int aqr_config_intr(struct phy_device *phydev) static int aqr_config_intr(struct phy_device *phydev)
{ {
bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED;
int err; int err;
if (phydev->interrupts == PHY_INTERRUPT_ENABLED) { err = phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_TX_VEND_INT_MASK2,
err = phy_write_mmd(phydev, MDIO_MMD_AN, en ? MDIO_AN_TX_VEND_INT_MASK2_LINK : 0);
MDIO_AN_TX_VEND_INT_MASK2, if (err < 0)
MDIO_AN_TX_VEND_INT_MASK2_LINK); return err;
if (err < 0)
return err;
err = phy_write_mmd(phydev, MDIO_MMD_VEND1, err = phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_INT_STD_MASK,
VEND1_GLOBAL_INT_STD_MASK, en ? VEND1_GLOBAL_INT_STD_MASK_ALL : 0);
VEND1_GLOBAL_INT_STD_MASK_ALL); if (err < 0)
if (err < 0) return err;
return err;
err = phy_write_mmd(phydev, MDIO_MMD_VEND1, return phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_INT_VEND_MASK,
VEND1_GLOBAL_INT_VEND_MASK, en ? VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 |
VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 | VEND1_GLOBAL_INT_VEND_MASK_AN : 0);
VEND1_GLOBAL_INT_VEND_MASK_AN);
} else {
err = phy_write_mmd(phydev, MDIO_MMD_AN,
MDIO_AN_TX_VEND_INT_MASK2, 0);
if (err < 0)
return err;
err = phy_write_mmd(phydev, MDIO_MMD_VEND1,
VEND1_GLOBAL_INT_STD_MASK, 0);
if (err < 0)
return err;
err = phy_write_mmd(phydev, MDIO_MMD_VEND1,
VEND1_GLOBAL_INT_VEND_MASK, 0);
}
return err;
} }
static int aqr_ack_interrupt(struct phy_device *phydev) static int aqr_ack_interrupt(struct phy_device *phydev)