diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-01-23 07:31:58 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-01-24 22:15:15 -0800 |
| commit | 434a4315b9617bf1742bc64712bf44a208502f7f (patch) | |
| tree | e9db332e38b6e90f441d4763b7e33ad83986486f /drivers/net/phy/phylink.c | |
| parent | net: phy: start interrupts in phy_start (diff) | |
| download | linux-dev-434a4315b9617bf1742bc64712bf44a208502f7f.tar.xz linux-dev-434a4315b9617bf1742bc64712bf44a208502f7f.zip | |
net: phy: change phy_start_interrupts to phy_request_interrupt
Now that we enable the interrupts in phy_start() we don't have to do it
before. Therefore remove enabling interrupts from phy_start_interrupts()
and rename this function to reflect the changed functionality.
v2:
- improve warning to clearly state that we fall back to polling
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/phylink.c')
| -rw-r--r-- | drivers/net/phy/phylink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index c1b6e05ba60c..2e21ce42e388 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -676,8 +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); - if (phy->irq > 0) - phy_start_interrupts(phy); + if (phy_interrupt_is_valid(phy)) + phy_request_interrupt(phy); return 0; } |