net: phy: remove gen10g_no_soft_reset

genphy_no_soft_reset and gen10g_no_soft_reset are both the same no-ops,
one is enough.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index 79106e70010fdee56dd3314d59bd72212d5e3165..100b401b1f4a125343afbf880a1ced60cc033d42 100644 (file)
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -459,7 +459,7 @@ static struct phy_driver mv3310_drivers[] = {
                .phy_id_mask    = MARVELL_PHY_ID_MASK,
                .name           = "mv88x3310",
                .get_features   = mv3310_get_features,
-               .soft_reset     = gen10g_no_soft_reset,
+               .soft_reset     = genphy_no_soft_reset,
                .config_init    = mv3310_config_init,
                .probe          = mv3310_probe,
                .suspend        = mv3310_suspend,
@@ -474,7 +474,7 @@ static struct phy_driver mv3310_drivers[] = {
                .name           = "mv88x2110",
                .get_features   = genphy_c45_pma_read_abilities,
                .probe          = mv3310_probe,
-               .soft_reset     = gen10g_no_soft_reset,
+               .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 6cd4bd5e9e43f9df35ae7b57dfaf18f6ee40b4b2..c596eb54e4ac3030c6a9006e4ab08de08c251793 100644 (file)
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -508,18 +508,11 @@ static int gen10g_read_status(struct phy_device *phydev)
        return genphy_c45_read_link(phydev);
 }
 
-int gen10g_no_soft_reset(struct phy_device *phydev)
-{
-       /* Do nothing for now */
-       return 0;
-}
-EXPORT_SYMBOL_GPL(gen10g_no_soft_reset);
-
 struct phy_driver genphy_10g_driver = {
        .phy_id         = 0xffffffff,
        .phy_id_mask    = 0xffffffff,
        .name           = "Generic 10G PHY",
-       .soft_reset     = gen10g_no_soft_reset,
+       .soft_reset     = genphy_no_soft_reset,
        .features       = PHY_10GBIT_FEATURES,
        .config_aneg    = gen10g_config_aneg,
        .read_status    = gen10g_read_status,

diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c
index 95280212d5d5da386c95b7d1a2ec2b512608248a..beb054b931eed5d556c3878ffabd088e3c1f7bdf 100644 (file)
--- a/drivers/net/phy/teranetics.c
+++ b/drivers/net/phy/teranetics.c
@@ -78,7 +78,7 @@ 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_aneg    = gen10g_config_aneg,
        .read_status    = teranetics_read_status,

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 60794240141fbfc98360f1be2ebdc6e7ddbdf231..34084892a466d6350984b69d07bd39cc9ecdb938 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1119,7 +1119,6 @@ int genphy_c45_read_status(struct phy_device *phydev);
 
 /* The gen10g_* functions are the old Clause 45 stub */
 int gen10g_config_aneg(struct phy_device *phydev);
-int gen10g_no_soft_reset(struct phy_device *phydev);
 
 static inline int phy_read_status(struct phy_device *phydev)
 {