Message ID | 20161110140301.13381-1-uwe@kleine-koenig.org |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Le 10/11/2016 à 06:03, Uwe Kleine-König a écrit : > 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. Seems reasonable to me: Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> > > Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> > --- > drivers/net/phy/marvell.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c > index c2dcf02df202..fa31f50824d3 100644 > --- a/drivers/net/phy/marvell.c > +++ b/drivers/net/phy/marvell.c > @@ -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; >
From: Uwe Kleine-König <uwe@kleine-koenig.org> Date: Thu, 10 Nov 2016 15:03:01 +0100 > 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: Uwe Kleine-König <uwe@kleine-koenig.org> Applied to net-next, thanks.
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index c2dcf02df202..fa31f50824d3 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -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;
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: Uwe Kleine-König <uwe@kleine-koenig.org> --- drivers/net/phy/marvell.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)