net: phy: mscc: improve vsc8514/8584_config_init consistency
authorAntoine Tenart <antoine.tenart@bootlin.com>
Thu, 25 Jun 2020 15:42:11 +0000 (17:42 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 25 Jun 2020 23:22:11 +0000 (16:22 -0700)
All PHY read and write return values are checked for errors in
vsc8514_config_init and vsc8584_config_init, except for one. Fix this.

Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/mscc/mscc_main.c

index 04e1ef7..a4fbf3a 100644 (file)
@@ -1375,8 +1375,10 @@ static int vsc8584_config_init(struct phy_device *phydev)
                        goto err;
        }
 
-       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,
-                      MSCC_PHY_PAGE_EXTENDED_GPIO);
+       ret = phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,
+                            MSCC_PHY_PAGE_EXTENDED_GPIO);
+       if (ret)
+               goto err;
 
        val = phy_base_read(phydev, MSCC_PHY_MAC_CFG_FASTLINK);
        val &= ~MAC_CFG_MASK;
@@ -1774,8 +1776,10 @@ static int vsc8514_config_init(struct phy_device *phydev)
        if (phy_package_init_once(phydev))
                vsc8514_config_pre_init(phydev);
 
-       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,
-                      MSCC_PHY_PAGE_EXTENDED_GPIO);
+       ret = phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,
+                            MSCC_PHY_PAGE_EXTENDED_GPIO);
+       if (ret)
+               goto err;
 
        val = phy_base_read(phydev, MSCC_PHY_MAC_CFG_FASTLINK);