public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: phy: mscc: shorten x != 0 condition to x

Browse source 
`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>
This commit is contained in:
Quentin Schulz 2018-10-08 12:07:27 +02:00 • committed by David S. Miller
parent b7d373c500
commit 6f0430c78c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/phy/mscc.c
View file

@ -310,7 +310,7 @@ static int vsc85xx_mdix_set(struct phy_device *phydev, u8 mdix)
DISABLE_HP_AUTO_MDIX_MASK); DISABLE_HP_AUTO_MDIX_MASK);
} }
rc = phy_write(phydev, MSCC_PHY_BYPASS_CONTROL, reg_val); rc = phy_write(phydev, MSCC_PHY_BYPASS_CONTROL, reg_val);
if (rc != 0) if (rc)
return rc; return rc;
reg_val = 0; 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 = phy_read(phydev, MII_VSC85XX_INT_MASK);
reg_val |= MII_VSC85XX_INT_MASK_WOL; reg_val |= MII_VSC85XX_INT_MASK_WOL;
rc = phy_write(phydev, MII_VSC85XX_INT_MASK, reg_val); rc = phy_write(phydev, MII_VSC85XX_INT_MASK, reg_val);
if (rc != 0) if (rc)
goto out_unlock; goto out_unlock;
} else { } else {
/* Disable the WOL interrupt */ /* Disable the WOL interrupt */
reg_val = phy_read(phydev, MII_VSC85XX_INT_MASK); reg_val = phy_read(phydev, MII_VSC85XX_INT_MASK);
reg_val &= (~MII_VSC85XX_INT_MASK_WOL); reg_val &= (~MII_VSC85XX_INT_MASK_WOL);
rc = phy_write(phydev, MII_VSC85XX_INT_MASK, reg_val); rc = phy_write(phydev, MII_VSC85XX_INT_MASK, reg_val);
if (rc != 0) if (rc)
goto out_unlock; goto out_unlock;
} }
/* Clear WOL iterrupt status */ /* Clear WOL iterrupt status */
@ -603,7 +603,7 @@ static int vsc85xx_mac_if_set(struct phy_device *phydev,
goto out_unlock; goto out_unlock;
} }
rc = phy_write(phydev, MSCC_PHY_EXT_PHY_CNTL_1, reg_val); rc = phy_write(phydev, MSCC_PHY_EXT_PHY_CNTL_1, reg_val);
if (rc != 0) if (rc)
goto out_unlock; goto out_unlock;
rc = genphy_soft_reset(phydev); rc = genphy_soft_reset(phydev);