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

net: phy: remove genphy_config_init 



Now that all users have been removed we can remove genphy_config_init.

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

drivers/net/phy/phy_device.c

+0 −51
Original line number Diff line number Diff line
@@ -1885,57 +1885,6 @@ int genphy_soft_reset(struct phy_device *phydev) 
}

EXPORT_SYMBOL(genphy_soft_reset);



int genphy_config_init(struct phy_device *phydev)

{

	int val;

	__ETHTOOL_DECLARE_LINK_MODE_MASK(features) = { 0, };



	linkmode_set_bit_array(phy_basic_ports_array,

			       ARRAY_SIZE(phy_basic_ports_array),

			       features);

	linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, features);

	linkmode_set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, features);



	/* Do we support autonegotiation? */

	val = phy_read(phydev, MII_BMSR);

	if (val < 0)

		return val;



	if (val & BMSR_ANEGCAPABLE)

		linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, features);



	if (val & BMSR_100FULL)

		linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, features);

	if (val & BMSR_100HALF)

		linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, features);

	if (val & BMSR_10FULL)

		linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT, features);

	if (val & BMSR_10HALF)

		linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, features);



	if (val & BMSR_ESTATEN) {

		val = phy_read(phydev, MII_ESTATUS);

		if (val < 0)

			return val;



		if (val & ESTATUS_1000_TFULL)

			linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,

					 features);

		if (val & ESTATUS_1000_THALF)

			linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,

					 features);

		if (val & ESTATUS_1000_XFULL)

			linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,

					 features);

	}



	linkmode_and(phydev->supported, phydev->supported, features);

	linkmode_and(phydev->advertising, phydev->advertising, features);



	return 0;

}

EXPORT_SYMBOL(genphy_config_init);



/**

 * genphy_read_abilities - read PHY abilities from Clause 22 registers

 * @phydev: target phy_device struct

include/linux/phy.h

+0 −1
Original line number Diff line number Diff line
@@ -1069,7 +1069,6 @@ void phy_attached_print(struct phy_device *phydev, const char *fmt, ...) 
void phy_attached_info(struct phy_device *phydev);



/* Clause 22 PHY */

int genphy_config_init(struct phy_device *phydev);

int genphy_read_abilities(struct phy_device *phydev);

int genphy_setup_forced(struct phy_device *phydev);

int genphy_restart_aneg(struct phy_device *phydev);