Skip to contentSkip to conversation

net: phy: remove phy_ethtool_sset()

PATCH Applied Russell King 3 participants 4 messages Nov 22, 2019 – Nov 23, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: phy: remove phy_ethtool_sset()

There are no users of phy_ethtool_sset() in the kernel anymore, and as of 3c1bcc8614db ("net: ethernet: Convert phydev advertize and supported from u32 to link mode"), the implementation is slightly buggy - it doesn't correctly check the masked advertising mask as it used to.

Remove it, and update the phy documentation to refer to its replacement function.

---
 Documentation/networking/phy.rst |  3 +-
 drivers/net/phy/phy.c            | 60 --------------------------------
 include/linux/phy.h              |  1 -
 3 files changed, 2 insertions(+), 62 deletions(-)
Documentation/networking/phy.rst +2 -1
index a689966bc4be..cda1c0a0492a 100644
@@ -352,7 +352,8 @@ Fills the phydev structure with up-to-date information about the current
 settings in the PHY.
 ::
 
- int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
+ int phy_ethtool_ksettings_set(struct phy_device *phydev,
+                               const struct ethtool_link_ksettings *cmd);
 
 Ethtool convenience functions.
 ::
drivers/net/phy/phy.c +0 -60

66 lines not on this page · raw message

include/linux/phy.h +0 -1
index 70173861e1a2..f172ff22c177 100644
@@ -1158,7 +1158,6 @@ void phy_queue_state_machine(struct phy_device *phydev, unsigned long jiffies);
 void phy_mac_interrupt(struct phy_device *phydev);
 void phy_start_machine(struct phy_device *phydev);
 void phy_stop_machine(struct phy_device *phydev);
-int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
 void phy_ethtool_ksettings_get(struct phy_device *phydev,
 			       struct ethtool_link_ksettings *cmd);
 int phy_ethtool_ksettings_set(struct phy_device *phydev,
Signature · 1 line
2.20.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Russell King

There are no users of phy_ethtool_sset() in the kernel anymore, and as of 3c1bcc8614db ("net: ethernet: Convert phydev advertize and supported from u32 to link mode"), the implementation is slightly buggy - it doesn't correctly check the masked advertising mask as it used to.

Remove it, and update the phy documentation to refer to its replacement function.

Andrew

#2 lore raw
In reply to Russell King
Quoted 10 lines · Russell King

There are no users of phy_ethtool_sset() in the kernel anymore, and as of 3c1bcc8614db ("net: ethernet: Convert phydev advertize and supported from u32 to link mode"), the implementation is slightly buggy - it doesn't correctly check the masked advertising mask as it used to.

Remove it, and update the phy documentation to refer to its replacement function.

Applied, thank you!

#3 lore raw
Quoted 7 lines · Jakub Kicinski
Quoted 6 lines · Russell King

There are no users of phy_ethtool_sset() in the kernel anymore, and as of 3c1bcc8614db ("net: ethernet: Convert phydev advertize and supported from u32 to link mode"), the implementation is slightly buggy - it doesn't correctly check the masked advertising mask as it used to.

Quoted 6 lines
Quoted 4 lines

Remove it, and update the phy documentation to refer to its replacement function.

Applied, thank you!

FWIW I've added the word "commit" before the hash, checkpatch is really insistent on that.