forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net: ethernet: cavium: octeon: use phy_ethtool_{get|set}_link_ksettings

Browse source 
There are two generics functions phy_ethtool_{get|set}_link_ksettings,
so we can use them instead of defining the same code in the driver.

Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Philippe Reynes 2016-07-02 23:37:00 +02:00 • committed by David S. Miller
parent 9e8e6e880d
commit f4400ded03
1 changed files with 2 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

25
drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
View file

@ -1346,27 +1346,6 @@ static void octeon_mgmt_get_drvinfo(struct net_device *netdev,
strlcpy(info->bus_info, "N/A", sizeof(info->bus_info)); strlcpy(info->bus_info, "N/A", sizeof(info->bus_info));
} }
static int octeon_mgmt_get_settings(struct net_device *netdev,
struct ethtool_cmd *cmd)
{
if (netdev->phydev)
return phy_ethtool_gset(netdev->phydev, cmd);
return -EOPNOTSUPP;
}
static int octeon_mgmt_set_settings(struct net_device *netdev,
struct ethtool_cmd *cmd)
{
if (!capable(CAP_NET_ADMIN))
return -EPERM;
if (netdev->phydev)
return phy_ethtool_sset(netdev->phydev, cmd);
return -EOPNOTSUPP;
}
static int octeon_mgmt_nway_reset(struct net_device *dev) static int octeon_mgmt_nway_reset(struct net_device *dev)
{ {
if (!capable(CAP_NET_ADMIN)) if (!capable(CAP_NET_ADMIN))
@ -1380,10 +1359,10 @@ static int octeon_mgmt_nway_reset(struct net_device *dev)
static const struct ethtool_ops octeon_mgmt_ethtool_ops = { static const struct ethtool_ops octeon_mgmt_ethtool_ops = {
.get_drvinfo = octeon_mgmt_get_drvinfo, .get_drvinfo = octeon_mgmt_get_drvinfo,
.get_settings = octeon_mgmt_get_settings,
.set_settings = octeon_mgmt_set_settings,
.nway_reset = octeon_mgmt_nway_reset, .nway_reset = octeon_mgmt_nway_reset,
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
.get_link_ksettings = phy_ethtool_get_link_ksettings,
.set_link_ksettings = phy_ethtool_set_link_ksettings,
}; };
static const struct net_device_ops octeon_mgmt_ops = { static const struct net_device_ops octeon_mgmt_ops = {