xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sfp/phylink: move module EEPROM ethtool access into netdev core ethtool

Browse Source 
Provide a pointer to the SFP bus in struct net_device, so that the
ethtool module EEPROM methods can access the SFP directly, rather
than needing every user to provide a hook for it.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King
2018-03-28 15:44:16 -07:00
committed by David S. Miller
parent c6ab3008b6
commit e679c9c1db
6 changed files with 12 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/ethernet/marvell/mvneta.c
View File

@@ -4075,22 +4075,6 @@ static int mvneta_ethtool_set_wol(struct net_device *dev,
return ret;
}
static int mvneta_ethtool_get_module_info(struct net_device *dev,
struct ethtool_modinfo *modinfo)
{
struct mvneta_port *pp = netdev_priv(dev);
return phylink_ethtool_get_module_info(pp->phylink, modinfo);
}
static int mvneta_ethtool_get_module_eeprom(struct net_device *dev,
struct ethtool_eeprom *ee, u8 *buf)
{
struct mvneta_port *pp = netdev_priv(dev);
return phylink_ethtool_get_module_eeprom(pp->phylink, ee, buf);
}
static int mvneta_ethtool_get_eee(struct net_device *dev,
struct ethtool_eee *eee)
{
@@ -4165,8 +4149,6 @@ static const struct ethtool_ops mvneta_eth_tool_ops = {
.set_link_ksettings = mvneta_ethtool_set_link_ksettings,
.get_wol = mvneta_ethtool_get_wol,
.set_wol = mvneta_ethtool_set_wol,
.get_module_info = mvneta_ethtool_get_module_info,
.get_module_eeprom = mvneta_ethtool_get_module_eeprom,
.get_eee = mvneta_ethtool_get_eee,
.set_eee = mvneta_ethtool_set_eee,
};