Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 22:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: ethernet: ti: cpmac: 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.

There was a check on CAP_NET_ADMIN in cpmac_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>
This commit is contained in:
Philippe Reynes 2016-07-15 12:39:02 +02:00 committed by David S. Miller
parent b401a9bce7
commit 7dc0993452
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/ethernet/ti/cpmac.c
View File

@ -837,25 +837,6 @@ static int cpmac_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
return phy_mii_ioctl(dev->phydev, ifr, cmd); return phy_mii_ioctl(dev->phydev, ifr, cmd);
} }
static int cpmac_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
if (dev->phydev)
return phy_ethtool_gset(dev->phydev, cmd);
return -EINVAL;
}
static int cpmac_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 void cpmac_get_ringparam(struct net_device *dev, static void cpmac_get_ringparam(struct net_device *dev,
struct ethtool_ringparam *ring) struct ethtool_ringparam *ring)
{ {
@ -893,12 +874,12 @@ static void cpmac_get_drvinfo(struct net_device *dev,
} }
static const struct ethtool_ops cpmac_ethtool_ops = { static const struct ethtool_ops cpmac_ethtool_ops = {
.get_settings = cpmac_get_settings,
.set_settings = cpmac_set_settings,
.get_drvinfo = cpmac_get_drvinfo, .get_drvinfo = cpmac_get_drvinfo,
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
.get_ringparam = cpmac_get_ringparam, .get_ringparam = cpmac_get_ringparam,
.set_ringparam = cpmac_set_ringparam, .set_ringparam = cpmac_set_ringparam,
.get_link_ksettings = phy_ethtool_get_link_ksettings,
.set_link_ksettings = phy_ethtool_set_link_ksettings,
}; };
static void cpmac_adjust_link(struct net_device *dev) static void cpmac_adjust_link(struct net_device *dev)