From: Russell King (Oracle) Date: Mon, 6 Jan 2025 11:58:53 +0000 (+0000) Subject: net: dsa: no longer call ds->ops->get_mac_eee() X-Git-Tag: v6.14-rc1~162^2~123^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60c6e3a59299361a1057b0b61d8b0495f6eb7cf7;p=thirdparty%2Fkernel%2Flinux.git net: dsa: no longer call ds->ops->get_mac_eee() All implementations of get_mac_eee() now just return zero without doing anything useful. Remove the call to this method in preparation to removing the method from each DSA driver. Signed-off-by: Russell King (Oracle) Link: https://patch.msgid.link/E1tUlkz-007Uyl-UA@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski --- diff --git a/net/dsa/user.c b/net/dsa/user.c index 4a8de48a6f249..c74f2b2b92dec 100644 --- a/net/dsa/user.c +++ b/net/dsa/user.c @@ -1251,7 +1251,6 @@ static int dsa_user_get_eee(struct net_device *dev, struct ethtool_keee *e) { struct dsa_port *dp = dsa_user_to_port(dev); struct dsa_switch *ds = dp->ds; - int ret; /* Check whether the switch supports EEE */ if (!ds->ops->support_eee || !ds->ops->support_eee(ds, dp->index)) @@ -1261,13 +1260,6 @@ static int dsa_user_get_eee(struct net_device *dev, struct ethtool_keee *e) if (!dev->phydev) return -ENODEV; - if (!ds->ops->get_mac_eee) - return -EOPNOTSUPP; - - ret = ds->ops->get_mac_eee(ds, dp->index, e); - if (ret) - return ret; - return phylink_ethtool_get_eee(dp->pl, e); }