Commit 31949154 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

net: phy: remove genphy_no_soft_reset

Since 6e2d85ec ("net: phy: Stop with excessive soft reset")
we don't need genphy_no_soft_reset() any longer. Not setting
callback soft_reset results in a no-op now.
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d70c47c8
...@@ -82,7 +82,6 @@ static struct phy_driver cortina_driver[] = { ...@@ -82,7 +82,6 @@ static struct phy_driver cortina_driver[] = {
.features = PHY_10GBIT_FEATURES, .features = PHY_10GBIT_FEATURES,
.config_aneg = gen10g_config_aneg, .config_aneg = gen10g_config_aneg,
.read_status = cortina_read_status, .read_status = cortina_read_status,
.soft_reset = genphy_no_soft_reset,
.probe = cortina_probe, .probe = cortina_probe,
}, },
}; };
......
...@@ -727,7 +727,6 @@ static struct phy_driver mv3310_drivers[] = { ...@@ -727,7 +727,6 @@ static struct phy_driver mv3310_drivers[] = {
.phy_id_mask = MARVELL_PHY_ID_MASK, .phy_id_mask = MARVELL_PHY_ID_MASK,
.name = "mv88x3310", .name = "mv88x3310",
.get_features = mv3310_get_features, .get_features = mv3310_get_features,
.soft_reset = genphy_no_soft_reset,
.config_init = mv3310_config_init, .config_init = mv3310_config_init,
.probe = mv3310_probe, .probe = mv3310_probe,
.suspend = mv3310_suspend, .suspend = mv3310_suspend,
...@@ -745,7 +744,6 @@ static struct phy_driver mv3310_drivers[] = { ...@@ -745,7 +744,6 @@ static struct phy_driver mv3310_drivers[] = {
.probe = mv3310_probe, .probe = mv3310_probe,
.suspend = mv3310_suspend, .suspend = mv3310_suspend,
.resume = mv3310_resume, .resume = mv3310_resume,
.soft_reset = genphy_no_soft_reset,
.config_init = mv3310_config_init, .config_init = mv3310_config_init,
.config_aneg = mv3310_config_aneg, .config_aneg = mv3310_config_aneg,
.aneg_done = mv3310_aneg_done, .aneg_done = mv3310_aneg_done,
......
...@@ -564,6 +564,5 @@ struct phy_driver genphy_c45_driver = { ...@@ -564,6 +564,5 @@ struct phy_driver genphy_c45_driver = {
.phy_id = 0xffffffff, .phy_id = 0xffffffff,
.phy_id_mask = 0xffffffff, .phy_id_mask = 0xffffffff,
.name = "Generic Clause 45 PHY", .name = "Generic Clause 45 PHY",
.soft_reset = genphy_no_soft_reset,
.read_status = genphy_c45_read_status, .read_status = genphy_c45_read_status,
}; };
...@@ -2630,7 +2630,6 @@ static struct phy_driver genphy_driver = { ...@@ -2630,7 +2630,6 @@ static struct phy_driver genphy_driver = {
.phy_id = 0xffffffff, .phy_id = 0xffffffff,
.phy_id_mask = 0xffffffff, .phy_id_mask = 0xffffffff,
.name = "Generic PHY", .name = "Generic PHY",
.soft_reset = genphy_no_soft_reset,
.get_features = genphy_read_abilities, .get_features = genphy_read_abilities,
.suspend = genphy_suspend, .suspend = genphy_suspend,
.resume = genphy_resume, .resume = genphy_resume,
......
...@@ -78,7 +78,6 @@ static struct phy_driver teranetics_driver[] = { ...@@ -78,7 +78,6 @@ static struct phy_driver teranetics_driver[] = {
.phy_id_mask = 0xffffffff, .phy_id_mask = 0xffffffff,
.name = "Teranetics TN2020", .name = "Teranetics TN2020",
.features = PHY_10GBIT_FEATURES, .features = PHY_10GBIT_FEATURES,
.soft_reset = genphy_no_soft_reset,
.aneg_done = teranetics_aneg_done, .aneg_done = teranetics_aneg_done,
.config_aneg = gen10g_config_aneg, .config_aneg = gen10g_config_aneg,
.read_status = teranetics_read_status, .read_status = teranetics_read_status,
......
...@@ -1251,10 +1251,6 @@ static inline int genphy_config_aneg(struct phy_device *phydev) ...@@ -1251,10 +1251,6 @@ static inline int genphy_config_aneg(struct phy_device *phydev)
return __genphy_config_aneg(phydev, false); return __genphy_config_aneg(phydev, false);
} }
static inline int genphy_no_soft_reset(struct phy_device *phydev)
{
return 0;
}
static inline int genphy_no_ack_interrupt(struct phy_device *phydev) static inline int genphy_no_ack_interrupt(struct phy_device *phydev)
{ {
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment