net: phy: remove genphy_no_soft_reset

Since 6e2d85ec0559 ("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: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c
index 856cdc36aacdddd876b8d03303614f61770c8f39..aac51362c0fead7b3b8e822da94e4afb928d20b1 100644 (file)
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -82,7 +82,6 @@ static struct phy_driver cortina_driver[] = {
        .features       = PHY_10GBIT_FEATURES,
        .config_aneg    = gen10g_config_aneg,
        .read_status    = cortina_read_status,
-       .soft_reset     = genphy_no_soft_reset,
        .probe          = cortina_probe,
 },
 };

diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index 95e3f4644aeb2047256716455ee49dfcfa91f772..80cbc77ffd55c5ff139ec391314d2a736e7e867c 100644 (file)
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -727,7 +727,6 @@ static struct phy_driver mv3310_drivers[] = {
                .phy_id_mask    = MARVELL_PHY_ID_MASK,
                .name           = "mv88x3310",
                .get_features   = mv3310_get_features,
-               .soft_reset     = genphy_no_soft_reset,
                .config_init    = mv3310_config_init,
                .probe          = mv3310_probe,
                .suspend        = mv3310_suspend,
@@ -745,7 +744,6 @@ static struct phy_driver mv3310_drivers[] = {
                .probe          = mv3310_probe,
                .suspend        = mv3310_suspend,
                .resume         = mv3310_resume,
-               .soft_reset     = genphy_no_soft_reset,
                .config_init    = mv3310_config_init,
                .config_aneg    = mv3310_config_aneg,
                .aneg_done      = mv3310_aneg_done,

diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
index 67ba47ae52848c612d7077166d8bfeb68168c24d..defe09d9442245f5b5a56b99b9647d5a116ebff0 100644 (file)
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -564,6 +564,5 @@ struct phy_driver genphy_c45_driver = {
        .phy_id         = 0xffffffff,
        .phy_id_mask    = 0xffffffff,
        .name           = "Generic Clause 45 PHY",
-       .soft_reset     = genphy_no_soft_reset,
        .read_status    = genphy_c45_read_status,
 };

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 206d98502b13c541cb374fe84bfa36ac0ad2f026..c8f8fd9908feeac007e33e396660e7a40c554054 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -2630,7 +2630,6 @@ static struct phy_driver genphy_driver = {
        .phy_id         = 0xffffffff,
        .phy_id_mask    = 0xffffffff,
        .name           = "Generic PHY",
-       .soft_reset     = genphy_no_soft_reset,
        .get_features   = genphy_read_abilities,
        .suspend        = genphy_suspend,
        .resume         = genphy_resume,

diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c
index beb054b931eed5d556c3878ffabd088e3c1f7bdf..8057ea8dbc218476a2de3dee204a29cf529af1bb 100644 (file)
--- a/drivers/net/phy/teranetics.c
+++ b/drivers/net/phy/teranetics.c
@@ -78,7 +78,6 @@ static struct phy_driver teranetics_driver[] = {
        .phy_id_mask    = 0xffffffff,
        .name           = "Teranetics TN2020",
        .features       = PHY_10GBIT_FEATURES,
-       .soft_reset     = genphy_no_soft_reset,
        .aneg_done      = teranetics_aneg_done,
        .config_aneg    = gen10g_config_aneg,
        .read_status    = teranetics_read_status,

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 3941a6bcba1019fb144d3a70c9dba5e7917f5acd..e2bfb92405870f067dcdd1d04f19b215f5e14756 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1251,10 +1251,6 @@ static inline int genphy_config_aneg(struct phy_device *phydev)
        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)
 {
        return 0;