aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2018-03-01 19:08:59 -0500
committerDavid S. Miller <davem@davemloft.net>2018-03-01 21:23:35 -0500
commit568477045f800ee1c68cb18f1e6e800c4365615c (patch)
treea424bdde03d475ae4d4d5c8081187b8a5b10e470
parent0adfdb667ab5a4c05765d0f3272afee82b2abf93 (diff)
net: phy: marvell10g: Utilize gen10g_no_soft_reset()
We do the same thing as the generic function: nothing, so utilize it. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-rw-r--r--drivers/net/phy/marvell10g.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index 8a0bd98fdec7..4f1efa02a930 100644
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -71,15 +71,6 @@ static int mv3310_probe(struct phy_device *phydev)
71 return 0; 71 return 0;
72} 72}
73 73
74/*
75 * Resetting the MV88X3310 causes it to become non-responsive. Avoid
76 * setting the reset bit(s).
77 */
78static int mv3310_soft_reset(struct phy_device *phydev)
79{
80 return 0;
81}
82
83static int mv3310_config_init(struct phy_device *phydev) 74static int mv3310_config_init(struct phy_device *phydev)
84{ 75{
85 __ETHTOOL_DECLARE_LINK_MODE_MASK(supported) = { 0, }; 76 __ETHTOOL_DECLARE_LINK_MODE_MASK(supported) = { 0, };
@@ -377,7 +368,7 @@ static struct phy_driver mv3310_drivers[] = {
377 SUPPORTED_10000baseT_Full | 368 SUPPORTED_10000baseT_Full |
378 SUPPORTED_Backplane, 369 SUPPORTED_Backplane,
379 .probe = mv3310_probe, 370 .probe = mv3310_probe,
380 .soft_reset = mv3310_soft_reset, 371 .soft_reset = gen10g_no_soft_reset,
381 .config_init = mv3310_config_init, 372 .config_init = mv3310_config_init,
382 .config_aneg = mv3310_config_aneg, 373 .config_aneg = mv3310_config_aneg,
383 .aneg_done = mv3310_aneg_done, 374 .aneg_done = mv3310_aneg_done,