diff options
| author |   Philippe Reynes <tremyfr@gmail.com> | 2016-07-30 16:14:44 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-08-08 15:42:20 -0700 |
| commit | 0d5704bf4ebe4d83ab46a2206a74faf2fe3a77af (patch) | |
| tree | 074c577b2c60719cdde22abae1e3ca98920fbfb8 | |
| parent | net: ethernet: octeon: use phydev from struct net_device (diff) | |
| download | linux-dev-0d5704bf4ebe4d83ab46a2206a74faf2fe3a77af.tar.xz linux-dev-0d5704bf4ebe4d83ab46a2206a74faf2fe3a77af.zip | |
net: ethernet: 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.
There was a check on CAP_NET_ADMIN in cvm_oct_set_settings, but this
check is already done in dev_ethtool, so no need to repeat it before
calling the generic function.
Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/staging/octeon/ethernet-mdio.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c index 661b97b9f6d2..1fde9c824948 100644 --- a/drivers/staging/octeon/ethernet-mdio.c +++ b/drivers/staging/octeon/ethernet-mdio.c @@ -34,25 +34,6 @@ static void cvm_oct_get_drvinfo(struct net_device *dev, strlcpy(info->bus_info, "Builtin", sizeof(info->bus_info)); } -static int cvm_oct_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) -{ - if (dev->phydev) - return phy_ethtool_gset(dev->phydev, cmd); - - return -EINVAL; -} - -static int cvm_oct_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) -{ - if (!capable(CAP_NET_ADMIN)) - return -EPERM; - - if (dev->phydev) - return phy_ethtool_sset(dev->phydev, cmd); - - return -EINVAL; -} - static int cvm_oct_nway_reset(struct net_device *dev) { if (!capable(CAP_NET_ADMIN)) @@ -66,10 +47,10 @@ static int cvm_oct_nway_reset(struct net_device *dev) const struct ethtool_ops cvm_oct_ethtool_ops = { .get_drvinfo = cvm_oct_get_drvinfo, - .get_settings = cvm_oct_get_settings, - .set_settings = cvm_oct_set_settings, .nway_reset = cvm_oct_nway_reset, .get_link = ethtool_op_get_link, + .get_link_ksettings = phy_ethtool_get_link_ksettings, + .set_link_ksettings = phy_ethtool_set_link_ksettings, }; /** |