From: Vladimir Zapolskiy <vz@mleia.com>
Date: Mon, 5 Sep 2011 07:24:08 +0000 (+0000)
Subject: phylib: remove a couple of redundant code lines
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=041c542219af7f31c372d89b4c7c6f4c8064a8ce;p=u-boot.git

phylib: remove a couple of redundant code lines

This change slightly improves readability of the phydev speed/duplex
assignment logic.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Acked-by: Detlev Zundel <dzu@denx.de>
---

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 8da7688d70..833a0512ec 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -318,13 +318,10 @@ static int genphy_parse_link(struct phy_device *phydev)
 		lpa = phy_read(phydev, MDIO_DEVAD_NONE, MII_ADVERTISE);
 		lpa &= phy_read(phydev, MDIO_DEVAD_NONE, MII_LPA);
 
-		if (lpa & (LPA_100FULL | LPA_100HALF)) {
+		if (lpa & (LPA_100FULL | LPA_100HALF))
 			phydev->speed = SPEED_100;
 
-			if (lpa & LPA_100FULL)
-				phydev->duplex = DUPLEX_FULL;
-
-		} else if (lpa & LPA_10FULL)
+		if (lpa & (LPA_100FULL | LPA_10FULL))
 			phydev->duplex = DUPLEX_FULL;
 	} else {
 		u32 bmcr = phy_read(phydev, MDIO_DEVAD_NONE, MII_BMCR);