diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-03-02 17:11:40 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-03-03 21:47:42 -0800 |
| commit | c5e91d39427d1759d6205599e145553b5b2bc19e (patch) | |
| tree | 8406a8c55f1323d5e6ba606db6f3cb2a70c34ee1 | |
| parent | net: phy: remove gen10g_suspend and gen10g_resume (diff) | |
| download | linux-dev-c5e91d39427d1759d6205599e145553b5b2bc19e.tar.xz linux-dev-c5e91d39427d1759d6205599e145553b5b2bc19e.zip | |
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>
| -rw-r--r-- | drivers/net/phy/cortina.c | 1 | ||||
| -rw-r--r-- | drivers/net/phy/phy-c45.c | 14 | ||||
| -rw-r--r-- | drivers/net/phy/teranetics.c | 1 | ||||
| -rw-r--r-- | include/linux/phy.h | 1 |
4 files changed, 0 insertions, 17 deletions
diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c index c291dc014769..a64eb211cc56 100644 --- 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 3ddbb9c32dda..cdbcea8609df 100644 --- 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 145c328b00fa..95280212d5d5 100644 --- 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 c69de3b87e87..817c8453aeb5 100644 --- 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) { |