net: phy: remove gen10g_config_init

ETHTOOL_LINK_MODE_10000baseT_Full_BIT is set anyway in the supported
and advertising bitmap because it's part of PHY_10GBIT_FEATURES.
And all users of gen10g_config_init use PHY_10GBIT_FEATURES.

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 c291dc014769dac785cc8fe712a7df6ca15b2343..a64eb211cc56008fcc515691c81586e53483fcb4 100644 (file)
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -80,7 +80,6 @@ static struct phy_driver cortina_driver[] = {
        .phy_id_mask    = 0xffffffff,
        .name           = "Cortina CS4340",
        .features       = PHY_10GBIT_FEATURES,
-       .config_init    = gen10g_config_init,
        .config_aneg    = gen10g_config_aneg,
        .read_status    = cortina_read_status,
        .soft_reset     = gen10g_no_soft_reset,

diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
index 3ddbb9c32ddaafaf332cfe9ade3675cdd0931a39..cdbcea8609df53f41284f2f28c0db91283b4b82e 100644 (file)
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -516,25 +516,11 @@ int gen10g_no_soft_reset(struct phy_device *phydev)
 }
 EXPORT_SYMBOL_GPL(gen10g_no_soft_reset);
 
-int gen10g_config_init(struct phy_device *phydev)
-{
-       /* Temporarily just say we support everything */
-       linkmode_zero(phydev->supported);
-
-       linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT,
-                        phydev->supported);
-       linkmode_copy(phydev->advertising, phydev->supported);
-
-       return 0;
-}
-EXPORT_SYMBOL_GPL(gen10g_config_init);
-
 struct phy_driver genphy_10g_driver = {
        .phy_id         = 0xffffffff,
        .phy_id_mask    = 0xffffffff,
        .name           = "Generic 10G PHY",
        .soft_reset     = gen10g_no_soft_reset,
-       .config_init    = gen10g_config_init,
        .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 145c328b00fa924c645e450a6c7e44e313dfe0f6..95280212d5d5da386c95b7d1a2ec2b512608248a 100644 (file)
--- a/drivers/net/phy/teranetics.c
+++ b/drivers/net/phy/teranetics.c
@@ -80,7 +80,6 @@ static struct phy_driver teranetics_driver[] = {
        .features       = PHY_10GBIT_FEATURES,
        .soft_reset     = gen10g_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,

diff --git a/include/linux/phy.h b/include/linux/phy.h
index c69de3b87e87f2a13ec371f772a3cc054edc9623..817c8453aeb5ff5967102128ebb573a588634554 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1121,7 +1121,6 @@ int genphy_c45_read_status(struct phy_device *phydev);
 int gen10g_config_aneg(struct phy_device *phydev);
 int gen10g_read_status(struct phy_device *phydev);
 int gen10g_no_soft_reset(struct phy_device *phydev);
-int gen10g_config_init(struct phy_device *phydev);
 
 static inline int phy_read_status(struct phy_device *phydev)
 {