Skip to content

Commit f4400de

Browse files
Philippe Reynesdavem330
authored andcommitted
net: ethernet: cavium: octeon: use phy_ethtool_{get|set}_link_ksettings
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 9e8e6e8 commit f4400de

File tree

1 file changed

+2
-23
lines changed

1 file changed

+2
-23
lines changed

drivers/net/ethernet/cavium/octeon/octeon_mgmt.c

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,27 +1346,6 @@ static void octeon_mgmt_get_drvinfo(struct net_device *netdev,
13461346
strlcpy(info->bus_info, "N/A", sizeof(info->bus_info));
13471347
}
13481348

1349-
static int octeon_mgmt_get_settings(struct net_device *netdev,
1350-
struct ethtool_cmd *cmd)
1351-
{
1352-
if (netdev->phydev)
1353-
return phy_ethtool_gset(netdev->phydev, cmd);
1354-
1355-
return -EOPNOTSUPP;
1356-
}
1357-
1358-
static int octeon_mgmt_set_settings(struct net_device *netdev,
1359-
struct ethtool_cmd *cmd)
1360-
{
1361-
if (!capable(CAP_NET_ADMIN))
1362-
return -EPERM;
1363-
1364-
if (netdev->phydev)
1365-
return phy_ethtool_sset(netdev->phydev, cmd);
1366-
1367-
return -EOPNOTSUPP;
1368-
}
1369-
13701349
static int octeon_mgmt_nway_reset(struct net_device *dev)
13711350
{
13721351
if (!capable(CAP_NET_ADMIN))
@@ -1380,10 +1359,10 @@ static int octeon_mgmt_nway_reset(struct net_device *dev)
13801359

13811360
static const struct ethtool_ops octeon_mgmt_ethtool_ops = {
13821361
.get_drvinfo = octeon_mgmt_get_drvinfo,
1383-
.get_settings = octeon_mgmt_get_settings,
1384-
.set_settings = octeon_mgmt_set_settings,
13851362
.nway_reset = octeon_mgmt_nway_reset,
13861363
.get_link = ethtool_op_get_link,
1364+
.get_link_ksettings = phy_ethtool_get_link_ksettings,
1365+
.set_link_ksettings = phy_ethtool_set_link_ksettings,
13871366
};
13881367

13891368
static const struct net_device_ops octeon_mgmt_ops = {

0 commit comments

Comments
 (0)