Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5718b5a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by David S. Miller
Browse files

net: phy: marvell: optimize logic for page changing during init 



Instead of remembering if the page was changed, just compare the current
page to the saved one. This is easier and has the advantage to save a
register write if the page was already restored.

Signed-off-by: default avatarUwe Kleine-König <uwe@kleine-koenig.org>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 849dcce3

drivers/net/phy/marvell.c

+2 −4
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static int m88e1111_config_aneg(struct phy_device *phydev) 
static int marvell_of_reg_init(struct phy_device *phydev)

{

	const __be32 *paddr;

	int len, i, saved_page, current_page, page_changed, ret;

	int len, i, saved_page, current_page, ret;



	if (!phydev->mdio.dev.of_node)

		return 0;
@@ -374,7 +374,6 @@ static int marvell_of_reg_init(struct phy_device *phydev) 
	saved_page = phy_read(phydev, MII_MARVELL_PHY_PAGE);

	if (saved_page < 0)

		return saved_page;

	page_changed = 0;

	current_page = saved_page;



	ret = 0;
@@ -388,7 +387,6 @@ static int marvell_of_reg_init(struct phy_device *phydev) 


		if (reg_page != current_page) {

			current_page = reg_page;

			page_changed = 1;

			ret = phy_write(phydev, MII_MARVELL_PHY_PAGE, reg_page);

			if (ret < 0)

				goto err;
@@ -411,7 +409,7 @@ static int marvell_of_reg_init(struct phy_device *phydev) 


	}

err:

	if (page_changed) {

	if (current_page != saved_page) {

		i = phy_write(phydev, MII_MARVELL_PHY_PAGE, saved_page);

		if (ret == 0)

			ret = i;