Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dc09934 authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller
Browse files

net: ethernet: ti: cpmac: 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 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: default avatarPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b401a9bc

drivers/net/ethernet/ti/cpmac.c

+2 −21
Original line number Diff line number Diff line
@@ -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);

}



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,

						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 = {

	.get_settings = cpmac_get_settings,

	.set_settings = cpmac_set_settings,

	.get_drvinfo = cpmac_get_drvinfo,

	.get_link = ethtool_op_get_link,

	.get_ringparam = cpmac_get_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)