Commit f28a602b authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by David S. Miller
Browse files

net: phy: use mii_bmcr_encode_fixed() 



phylib can make use of the newly introduced mii_bmcr_encode_fixed()
macro, so let's convert it over.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bdb6cfe7

drivers/net/phy/phy_device.c

+3 −15
Original line number Diff line number Diff line
@@ -2001,18 +2001,12 @@ EXPORT_SYMBOL(genphy_config_eee_advert); 
 */

int genphy_setup_forced(struct phy_device *phydev)

{

	u16 ctl = 0;

	u16 ctl;



	phydev->pause = 0;

	phydev->asym_pause = 0;



	if (SPEED_1000 == phydev->speed)

		ctl |= BMCR_SPEED1000;

	else if (SPEED_100 == phydev->speed)

		ctl |= BMCR_SPEED100;



	if (DUPLEX_FULL == phydev->duplex)

		ctl |= BMCR_FULLDPLX;

	ctl = mii_bmcr_encode_fixed(phydev->speed, phydev->duplex);



	return phy_modify(phydev, MII_BMCR,

			  ~(BMCR_LOOPBACK | BMCR_ISOLATE | BMCR_PDOWN), ctl);
@@ -2614,13 +2608,7 @@ int genphy_loopback(struct phy_device *phydev, bool enable) 
		u16 val, ctl = BMCR_LOOPBACK;

		int ret;



		if (phydev->speed == SPEED_1000)

			ctl |= BMCR_SPEED1000;

		else if (phydev->speed == SPEED_100)

			ctl |= BMCR_SPEED100;



		if (phydev->duplex == DUPLEX_FULL)

			ctl |= BMCR_FULLDPLX;

		ctl |= mii_bmcr_encode_fixed(phydev->speed, phydev->duplex);



		phy_modify(phydev, MII_BMCR, ~0, ctl);