Commit 31949154 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: phy: remove genphy_no_soft_reset 



Since 6e2d85ec ("net: phy: Stop with excessive soft reset")
we don't need genphy_no_soft_reset() any longer. Not setting
callback soft_reset results in a no-op now.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d70c47c8

drivers/net/phy/cortina.c

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ static struct phy_driver cortina_driver[] = { 
	.features       = PHY_10GBIT_FEATURES,

	.config_aneg	= gen10g_config_aneg,

	.read_status	= cortina_read_status,

	.soft_reset	= genphy_no_soft_reset,

	.probe		= cortina_probe,

},

};

drivers/net/phy/marvell10g.c

+0 −2
Original line number Diff line number Diff line
@@ -727,7 +727,6 @@ static struct phy_driver mv3310_drivers[] = { 
		.phy_id_mask	= MARVELL_PHY_ID_MASK,

		.name		= "mv88x3310",

		.get_features	= mv3310_get_features,

		.soft_reset	= genphy_no_soft_reset,

		.config_init	= mv3310_config_init,

		.probe		= mv3310_probe,

		.suspend	= mv3310_suspend,
@@ -745,7 +744,6 @@ static struct phy_driver mv3310_drivers[] = { 
		.probe		= mv3310_probe,

		.suspend	= mv3310_suspend,

		.resume		= mv3310_resume,

		.soft_reset	= genphy_no_soft_reset,

		.config_init	= mv3310_config_init,

		.config_aneg	= mv3310_config_aneg,

		.aneg_done	= mv3310_aneg_done,

drivers/net/phy/phy-c45.c

+0 −1
Original line number Diff line number Diff line
@@ -564,6 +564,5 @@ struct phy_driver genphy_c45_driver = { 
	.phy_id         = 0xffffffff,

	.phy_id_mask    = 0xffffffff,

	.name           = "Generic Clause 45 PHY",

	.soft_reset	= genphy_no_soft_reset,

	.read_status    = genphy_c45_read_status,

};

drivers/net/phy/phy_device.c

+0 −1
Original line number Diff line number Diff line
@@ -2630,7 +2630,6 @@ static struct phy_driver genphy_driver = { 
	.phy_id		= 0xffffffff,

	.phy_id_mask	= 0xffffffff,

	.name		= "Generic PHY",

	.soft_reset	= genphy_no_soft_reset,

	.get_features	= genphy_read_abilities,

	.suspend	= genphy_suspend,

	.resume		= genphy_resume,

drivers/net/phy/teranetics.c

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ static struct phy_driver teranetics_driver[] = { 
	.phy_id_mask	= 0xffffffff,

	.name		= "Teranetics TN2020",

	.features       = PHY_10GBIT_FEATURES,

	.soft_reset	= genphy_no_soft_reset,

	.aneg_done	= teranetics_aneg_done,

	.config_aneg    = gen10g_config_aneg,

	.read_status	= teranetics_read_status,

CRA Git | Maintained and supported by SUSTech CRA and CCSE