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

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6d0aa97

drivers/net/phy/cortina.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

drivers/net/phy/phy-c45.c

+0 −14
Original line number Diff line number Diff line
@@ -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,

drivers/net/phy/teranetics.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

include/linux/phy.h

+0 −1
Original line number Diff line number Diff line
@@ -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)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE