diff options
author | David S. Miller <davem@davemloft.net> | 2019-01-24 22:15:15 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-01-24 22:15:15 -0800 |
commit | 2ab64da68c2b4aaf2996db66f07c8df6d7b97f36 (patch) | |
tree | e9db332e38b6e90f441d4763b7e33ad83986486f /include | |
parent | net: stmmac: Fix return value check in qcom_ethqos_probe() (diff) | |
parent | net: phy: change phy_start_interrupts to phy_request_interrupt (diff) | |
download | linux-dev-2ab64da68c2b4aaf2996db66f07c8df6d7b97f36.tar.xz linux-dev-2ab64da68c2b4aaf2996db66f07c8df6d7b97f36.zip |
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 <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/phy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index 1f3873a2ff29..70f83d0d7469 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1047,7 +1047,7 @@ void phy_ethtool_ksettings_get(struct phy_device *phydev, int phy_ethtool_ksettings_set(struct phy_device *phydev, const struct ethtool_link_ksettings *cmd); int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd); -int phy_start_interrupts(struct phy_device *phydev); +void phy_request_interrupt(struct phy_device *phydev); void phy_print_status(struct phy_device *phydev); int phy_set_max_speed(struct phy_device *phydev, u32 max_speed); void phy_remove_link_mode(struct phy_device *phydev, u32 link_mode); |