aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy/marvell.c
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2017-05-17 03:26:01 +0200
committerDavid S. Miller <davem@davemloft.net>2017-05-17 16:27:51 -0400
commit4f48ed32fb62fc1546306c1488e259c0c4f4f462 (patch)
tree01aab76a75431d369676882a4ba7692594252c09 /drivers/net/phy/marvell.c
parentnet: phy: marvell: Checkpatch - Missing or extra blank lines (diff)
downloadlinux-dev-4f48ed32fb62fc1546306c1488e259c0c4f4f462.tar.xz
linux-dev-4f48ed32fb62fc1546306c1488e259c0c4f4f462.zip
net: phy: marvell: Checkpatch - assignments and comparisons
Avoid multiple assignments Comparisons should place the constant on the right side of the test Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--drivers/net/phy/marvell.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index f52656ec618f..e9632f576a24 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -1101,7 +1101,7 @@ static int marvell_read_status_page(struct phy_device *phydev, int page)
if (err)
return err;
- if (AUTONEG_ENABLE == phydev->autoneg) {
+ if (phydev->autoneg == AUTONEG_ENABLE) {
status = phy_read(phydev, MII_M1011_PHY_STATUS);
if (status < 0)
return status;
@@ -1126,7 +1126,8 @@ static int marvell_read_status_page(struct phy_device *phydev, int page)
phydev->duplex = DUPLEX_HALF;
status = status & MII_M1011_PHY_STATUS_SPD_MASK;
- phydev->pause = phydev->asym_pause = 0;
+ phydev->pause = 0;
+ phydev->asym_pause = 0;
switch (status) {
case MII_M1011_PHY_STATUS_1000:
@@ -1185,7 +1186,8 @@ static int marvell_read_status_page(struct phy_device *phydev, int page)
else
phydev->speed = SPEED_10;
- phydev->pause = phydev->asym_pause = 0;
+ phydev->pause = 0;
+ phydev->asym_pause = 0;
phydev->lp_advertising = 0;
}