[PATCH net-next] net: phy: read MII_CTRL1000 in genphy_read_status only if needed

[Heiner Kallweit]

Value of MII_CTRL1000 is needed only if LPA_1000MSFAIL is set.
Therefore move reading this register.

Signed-off-by: Heiner Kallweit <hkallwe...@gmail.com>
---
 drivers/net/phy/phy_device.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 54f80af31..4f4ddc05c 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1794,7 +1794,7 @@ EXPORT_SYMBOL(genphy_update_link);
  */
 int genphy_read_status(struct phy_device *phydev)
 {
-       int adv, lpa, lpagb, err, old_link = phydev->link;
+       int lpa, lpagb, err, old_link = phydev->link;
 
        /* Update the link, but return if there was an error */
        err = genphy_update_link(phydev);
@@ -1816,11 +1816,12 @@ int genphy_read_status(struct phy_device *phydev)
                        if (lpagb < 0)
                                return lpagb;
 
-                       adv = phy_read(phydev, MII_CTRL1000);
-                       if (adv < 0)
-                               return adv;
-
                        if (lpagb & LPA_1000MSFAIL) {
+                               int adv = phy_read(phydev, MII_CTRL1000);
+
+                               if (adv < 0)
+                                       return adv;
+
                                if (adv & CTL1000_ENABLE_MASTER)
                                        phydev_err(phydev, "Master/Slave 
resolution failed, maybe conflicting manual settings?\n");
                                else
-- 
2.22.0