aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy/teranetics.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-03-03 21:48:06 -0800
committerDavid S. Miller <davem@davemloft.net>2019-03-03 21:48:06 -0800
commit7d827379b062533085f3cd31762a8bb7bf48df19 (patch)
tree5a01c7bc9878996169117e00bb18e78c7ce0a1f9 /drivers/net/phy/teranetics.c
parentfsl/fman: Use vsprintf extension %pM (diff)
parentnet: phy: remove gen10g_no_soft_reset (diff)
downloadlinux-dev-7d827379b062533085f3cd31762a8bb7bf48df19.tar.xz
linux-dev-7d827379b062533085f3cd31762a8bb7bf48df19.zip
Merge branch 'net-phy-clean-up-the-old-gen10g-functions'
Heiner Kallweit says: ==================== net: phy: clean up the old gen10g functions The old gen10g_ functions are mainly stubs and have been superseded by genphy_c45_ equivalents. So lets remove / hide the old functions as far as possible. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/teranetics.c')
-rw-r--r--drivers/net/phy/teranetics.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c
index 145c328b00fa..beb054b931ee 100644
--- a/drivers/net/phy/teranetics.c
+++ b/drivers/net/phy/teranetics.c
@@ -78,9 +78,8 @@ static struct phy_driver teranetics_driver[] = {
.phy_id_mask = 0xffffffff,
.name = "Teranetics TN2020",
.features = PHY_10GBIT_FEATURES,
- .soft_reset = gen10g_no_soft_reset,
+ .soft_reset = genphy_no_soft_reset,
.aneg_done = teranetics_aneg_done,
- .config_init = gen10g_config_init,
.config_aneg = gen10g_config_aneg,
.read_status = teranetics_read_status,
.match_phy_device = teranetics_match_phy_device,