From: Al Stone ahs3@redhat.com
The function amd_xgbe_an_enable_kr_training ended up being defined twice. Removed the first definition in the file.
Signed-off-by: Al Stone al.stone@linaro.org --- drivers/net/phy/amd-xgbe-phy.c | 14 -------------- 1 file changed, 14 deletions(-)
diff --git a/drivers/net/phy/amd-xgbe-phy.c b/drivers/net/phy/amd-xgbe-phy.c index d852c6e..9184eb0 100644 --- a/drivers/net/phy/amd-xgbe-phy.c +++ b/drivers/net/phy/amd-xgbe-phy.c @@ -289,20 +289,6 @@ struct amd_xgbe_phy_priv { struct workqueue_struct *an_workqueue; };
-static int amd_xgbe_an_enable_kr_training(struct phy_device *phydev) -{ - int ret; - - ret = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_PMD_CTRL); - if (ret < 0) - return ret; - - ret |= 0x02; - phy_write_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_PMD_CTRL, ret); - - return 0; -} - static int amd_xgbe_an_disable_kr_training(struct phy_device *phydev) { int ret;