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

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

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

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

+2 −45
Original line number Diff line number Diff line
@@ -1076,49 +1076,6 @@ static const struct net_device_ops axienet_netdev_ops = { 
#endif

};



/**

 * axienet_ethtools_get_settings - Get Axi Ethernet settings related to PHY.

 * @ndev:	Pointer to net_device structure

 * @ecmd:	Pointer to ethtool_cmd structure

 *

 * This implements ethtool command for getting PHY settings. If PHY could

 * not be found, the function returns -ENODEV. This function calls the

 * relevant PHY ethtool API to get the PHY settings.

 * Issue "ethtool ethX" under linux prompt to execute this function.

 *

 * Return: 0 on success, -ENODEV if PHY doesn't exist

 */

static int axienet_ethtools_get_settings(struct net_device *ndev,

					 struct ethtool_cmd *ecmd)

{

	struct phy_device *phydev = ndev->phydev;

	if (!phydev)

		return -ENODEV;

	return phy_ethtool_gset(phydev, ecmd);

}



/**

 * axienet_ethtools_set_settings - Set PHY settings as passed in the argument.

 * @ndev:	Pointer to net_device structure

 * @ecmd:	Pointer to ethtool_cmd structure

 *

 * This implements ethtool command for setting various PHY settings. If PHY

 * could not be found, the function returns -ENODEV. This function calls the

 * relevant PHY ethtool API to set the PHY.

 * Issue e.g. "ethtool -s ethX speed 1000" under linux prompt to execute this

 * function.

 *

 * Return: 0 on success, -ENODEV if PHY doesn't exist

 */

static int axienet_ethtools_set_settings(struct net_device *ndev,

					 struct ethtool_cmd *ecmd)

{

	struct phy_device *phydev = ndev->phydev;

	if (!phydev)

		return -ENODEV;

	return phy_ethtool_sset(phydev, ecmd);

}



/**

 * axienet_ethtools_get_drvinfo - Get various Axi Ethernet driver information.

 * @ndev:	Pointer to net_device structure
@@ -1341,8 +1298,6 @@ static int axienet_ethtools_set_coalesce(struct net_device *ndev, 
}



static struct ethtool_ops axienet_ethtool_ops = {

	.get_settings   = axienet_ethtools_get_settings,

	.set_settings   = axienet_ethtools_set_settings,

	.get_drvinfo    = axienet_ethtools_get_drvinfo,

	.get_regs_len   = axienet_ethtools_get_regs_len,

	.get_regs       = axienet_ethtools_get_regs,
@@ -1351,6 +1306,8 @@ static struct ethtool_ops axienet_ethtool_ops = { 
	.set_pauseparam = axienet_ethtools_set_pauseparam,

	.get_coalesce   = axienet_ethtools_get_coalesce,

	.set_coalesce   = axienet_ethtools_set_coalesce,

	.get_link_ksettings = phy_ethtool_get_link_ksettings,

	.set_link_ksettings = phy_ethtool_set_link_ksettings,

};



/**