Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f0430c7 authored by Quentin Schulz's avatar Quentin Schulz Committed by David S. Miller
Browse files

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarQuentin Schulz <quentin.schulz@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b7d373c5

drivers/net/phy/mscc.c

+4 −4
Original line number Diff line number Diff line
@@ -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);