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

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

net: ethernet: adi: bfin_mac: 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 bfin_mac_ethtool_setsettings,
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 ec87485d

drivers/net/ethernet/adi/bfin_mac.c

+2 −23
Original line number Diff line number Diff line
@@ -449,27 +449,6 @@ static irqreturn_t bfin_mac_wake_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static int

bfin_mac_ethtool_getsettings(struct net_device *dev, struct ethtool_cmd *cmd)

{

	if (dev->phydev)

		return phy_ethtool_gset(dev->phydev, cmd);



	return -EINVAL;

}



static int

bfin_mac_ethtool_setsettings(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 bfin_mac_ethtool_getdrvinfo(struct net_device *dev,

					struct ethtool_drvinfo *info)

{
@@ -547,8 +526,6 @@ static int bfin_mac_ethtool_get_ts_info(struct net_device *dev, 
#endif



static const struct ethtool_ops bfin_mac_ethtool_ops = {

	.get_settings = bfin_mac_ethtool_getsettings,

	.set_settings = bfin_mac_ethtool_setsettings,

	.get_link = ethtool_op_get_link,

	.get_drvinfo = bfin_mac_ethtool_getdrvinfo,

	.get_wol = bfin_mac_ethtool_getwol,
@@ -556,6 +533,8 @@ static const struct ethtool_ops bfin_mac_ethtool_ops = { 
#ifdef CONFIG_BFIN_MAC_USE_HWSTAMP

	.get_ts_info = bfin_mac_ethtool_get_ts_info,

#endif

	.get_link_ksettings = phy_ethtool_get_link_ksettings,

	.set_link_ksettings = phy_ethtool_set_link_ksettings,

};



/**************************************************************************/