OSDN Git Service

net: phy: mscc: shorten `x != 0` condition to `x`
authorQuentin Schulz <quentin.schulz@bootlin.com>
Mon, 8 Oct 2018 10:07:27 +0000 (12:07 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 Oct 2018 17:29:21 +0000 (10:29 -0700)
`if (x != 0)` is basically a more verbose version of `if (x)` so let's
use the latter so it's consistent throughout the whole driver.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/mscc.c

index 0ff7803..6bfdc16 100644 (file)
@@ -310,7 +310,7 @@ static int vsc85xx_mdix_set(struct phy_device *phydev, u8 mdix)
                             DISABLE_HP_AUTO_MDIX_MASK);
        }
        rc = phy_write(phydev, MSCC_PHY_BYPASS_CONTROL, reg_val);
-       if (rc != 0)
+       if (rc)
                return rc;
 
        reg_val = 0;
@@ -425,14 +425,14 @@ static int vsc85xx_wol_set(struct phy_device *phydev,
                reg_val = phy_read(phydev, MII_VSC85XX_INT_MASK);
                reg_val |= MII_VSC85XX_INT_MASK_WOL;
                rc = phy_write(phydev, MII_VSC85XX_INT_MASK, reg_val);
-               if (rc != 0)
+               if (rc)
                        goto out_unlock;
        } else {
                /* Disable the WOL interrupt */
                reg_val = phy_read(phydev, MII_VSC85XX_INT_MASK);
                reg_val &= (~MII_VSC85XX_INT_MASK_WOL);
                rc = phy_write(phydev, MII_VSC85XX_INT_MASK, reg_val);
-               if (rc != 0)
+               if (rc)
                        goto out_unlock;
        }
        /* Clear WOL iterrupt status */
@@ -603,7 +603,7 @@ static int vsc85xx_mac_if_set(struct phy_device *phydev,
                goto out_unlock;
        }
        rc = phy_write(phydev, MSCC_PHY_EXT_PHY_CNTL_1, reg_val);
-       if (rc != 0)
+       if (rc)
                goto out_unlock;
 
        rc = genphy_soft_reset(phydev);