diff options
| author | Quentin Schulz <quentin.schulz@bootlin.com> | 2018-10-08 12:07:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-08 10:29:21 -0700 |
| commit | 6f0430c78c05ce288f0ead7d440233a0fb9cac31 (patch) | |
| tree | 9b800c395ea54d5664a71c370637acc6e73a6b0f /drivers/net/phy/mscc.c | |
| parent | b7d373c500cf4009d78db62329c3b7cfba111713 (diff) | |
| download | talos-op-linux-6f0430c78c05ce288f0ead7d440233a0fb9cac31.tar.gz talos-op-linux-6f0430c78c05ce288f0ead7d440233a0fb9cac31.zip | |
net: phy: mscc: shorten `x != 0` condition to `x`
`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>
Diffstat (limited to 'drivers/net/phy/mscc.c')
| -rw-r--r-- | drivers/net/phy/mscc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c index 0ff7803ed16b..6bfdc168c62b 100644 --- a/drivers/net/phy/mscc.c +++ b/drivers/net/phy/mscc.c @@ -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); |
