aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/phy/phylink.c
diff options
context:
space:
mode:
authorDavid S. Miller <[email protected]>2019-01-24 22:15:15 -0800
committerDavid S. Miller <[email protected]>2019-01-24 22:15:15 -0800
commit2ab64da68c2b4aaf2996db66f07c8df6d7b97f36 (patch)
treee9db332e38b6e90f441d4763b7e33ad83986486f /drivers/net/phy/phylink.c
parent8f4ebaaa8d97dc531a3f947a8d30a5a70fe38743 (diff)
parent434a4315b9617bf1742bc64712bf44a208502f7f (diff)
Merge branch 'net-phy-improve-starting-PHY'
Heiner Kallweit says: ==================== net: phy: improve starting PHY This patch series improves few aspects of starting the PHY. v2: - improve a warning in patch 4 v3: - extend commit message for patch 2 ==================== Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/net/phy/phylink.c')
-rw-r--r--drivers/net/phy/phylink.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 7d9910da5018..2e21ce42e388 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -676,9 +676,8 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy)
__ETHTOOL_LINK_MODE_MASK_NBITS, pl->supported,
__ETHTOOL_LINK_MODE_MASK_NBITS, phy->advertising);
- phy_start_machine(phy);
- if (phy->irq > 0)
- phy_start_interrupts(phy);
+ if (phy_interrupt_is_valid(phy))
+ phy_request_interrupt(phy);
return 0;
}