iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: phy: remove gen10g_no_soft_reset

Browse Source 
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>
This commit is contained in:
Heiner Kallweit
2019-03-02 17:13:11 +01:00
committed by David S. Miller
parent d81210c25e
commit 7be3ad848f
5 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/phy/cortina.c
View File

@ -82,7 +82,7 @@ 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 = gen10g_no_soft_reset, .soft_reset = genphy_no_soft_reset,
.probe = cortina_probe, .probe = cortina_probe,
}, },
}; };

4
drivers/net/phy/marvell10g.c
View File

@ -459,7 +459,7 @@ 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 = gen10g_no_soft_reset, .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,
@ -474,7 +474,7 @@ static struct phy_driver mv3310_drivers[] = {
.name = "mv88x2110", .name = "mv88x2110",
.get_features = genphy_c45_pma_read_abilities, .get_features = genphy_c45_pma_read_abilities,
.probe = mv3310_probe, .probe = mv3310_probe,
.soft_reset = gen10g_no_soft_reset, .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,

9
drivers/net/phy/phy-c45.c
View File

@ -508,18 +508,11 @@ static int gen10g_read_status(struct phy_device *phydev)
return genphy_c45_read_link(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 = { struct phy_driver genphy_10g_driver = {
.phy_id = 0xffffffff, .phy_id = 0xffffffff,
.phy_id_mask = 0xffffffff, .phy_id_mask = 0xffffffff,
.name = "Generic 10G PHY", .name = "Generic 10G PHY",
.soft_reset = gen10g_no_soft_reset, .soft_reset = genphy_no_soft_reset,
.features = PHY_10GBIT_FEATURES, .features = PHY_10GBIT_FEATURES,
.config_aneg = gen10g_config_aneg, .config_aneg = gen10g_config_aneg,
.read_status = gen10g_read_status, .read_status = gen10g_read_status,

2
drivers/net/phy/teranetics.c
View File

@ -78,7 +78,7 @@ 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 = gen10g_no_soft_reset, .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,

1
include/linux/phy.h
View File

@ -1119,7 +1119,6 @@ int genphy_c45_read_status(struct phy_device *phydev);
/* The gen10g_* functions are the old Clause 45 stub */ /* The gen10g_* functions are the old Clause 45 stub */
int gen10g_config_aneg(struct phy_device *phydev); 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) static inline int phy_read_status(struct phy_device *phydev)
{ {