Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Heiner Kallweit and committed by
David S. Miller
7be3ad84 d81210c2

+5 -13
+1 -1
drivers/net/phy/cortina.c
··· 82 82 .features = PHY_10GBIT_FEATURES, 83 83 .config_aneg = gen10g_config_aneg, 84 84 .read_status = cortina_read_status, 85 - .soft_reset = gen10g_no_soft_reset, 85 + .soft_reset = genphy_no_soft_reset, 86 86 .probe = cortina_probe, 87 87 }, 88 88 };
+2 -2
drivers/net/phy/marvell10g.c
··· 459 459 .phy_id_mask = MARVELL_PHY_ID_MASK, 460 460 .name = "mv88x3310", 461 461 .get_features = mv3310_get_features, 462 - .soft_reset = gen10g_no_soft_reset, 462 + .soft_reset = genphy_no_soft_reset, 463 463 .config_init = mv3310_config_init, 464 464 .probe = mv3310_probe, 465 465 .suspend = mv3310_suspend, ··· 474 474 .name = "mv88x2110", 475 475 .get_features = genphy_c45_pma_read_abilities, 476 476 .probe = mv3310_probe, 477 - .soft_reset = gen10g_no_soft_reset, 477 + .soft_reset = genphy_no_soft_reset, 478 478 .config_init = mv3310_config_init, 479 479 .config_aneg = mv3310_config_aneg, 480 480 .aneg_done = mv3310_aneg_done,
+1 -8
drivers/net/phy/phy-c45.c
··· 508 508 return genphy_c45_read_link(phydev); 509 509 } 510 510 511 - int gen10g_no_soft_reset(struct phy_device *phydev) 512 - { 513 - /* Do nothing for now */ 514 - return 0; 515 - } 516 - EXPORT_SYMBOL_GPL(gen10g_no_soft_reset); 517 - 518 511 struct phy_driver genphy_10g_driver = { 519 512 .phy_id = 0xffffffff, 520 513 .phy_id_mask = 0xffffffff, 521 514 .name = "Generic 10G PHY", 522 - .soft_reset = gen10g_no_soft_reset, 515 + .soft_reset = genphy_no_soft_reset, 523 516 .features = PHY_10GBIT_FEATURES, 524 517 .config_aneg = gen10g_config_aneg, 525 518 .read_status = gen10g_read_status,
+1 -1
drivers/net/phy/teranetics.c
··· 78 78 .phy_id_mask = 0xffffffff, 79 79 .name = "Teranetics TN2020", 80 80 .features = PHY_10GBIT_FEATURES, 81 - .soft_reset = gen10g_no_soft_reset, 81 + .soft_reset = genphy_no_soft_reset, 82 82 .aneg_done = teranetics_aneg_done, 83 83 .config_aneg = gen10g_config_aneg, 84 84 .read_status = teranetics_read_status,
-1
include/linux/phy.h
··· 1119 1119 1120 1120 /* The gen10g_* functions are the old Clause 45 stub */ 1121 1121 int gen10g_config_aneg(struct phy_device *phydev); 1122 - int gen10g_no_soft_reset(struct phy_device *phydev); 1123 1122 1124 1123 static inline int phy_read_status(struct phy_device *phydev) 1125 1124 {