net: phy: dp83867: Fix warning check for setting the internal delay

Dan Murphy · davem330 · commit a46fa260f6f5 · 2015-07-21T22:29:31.000-07:00
Fix warning: logical ‘or’ of collectively exhaustive tests is always true

Change the internal delay check from an 'or' condition to an 'and'
condition.

Reported-by: David Binderman &lt;dcb314@hotmail.com&gt;
Signed-off-by: Dan Murphy &lt;dmurphy@ti.com&gt;
Acked-by: Florian Fainelli &lt;f.fainelli@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
@@ -164,7 +164,7 @@ static int dp83867_config_init(struct phy_device *phydev)
 			return ret;
 	}
 
-	if ((phydev->interface >= PHY_INTERFACE_MODE_RGMII_ID) ||
+	if ((phydev->interface >= PHY_INTERFACE_MODE_RGMII_ID) &&
 	    (phydev->interface <= PHY_INTERFACE_MODE_RGMII_RXID)) {
 		val = phy_read_mmd_indirect(phydev, DP83867_RGMIICTL,
 					    DP83867_DEVADDR, phydev->addr);

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ static int dp83867_config_init(struct phy_device *phydev)`
`164`	`164`	`return ret;`
`165`	`165`	`}`
`166`	`166`
`167`		`- if ((phydev->interface >= PHY_INTERFACE_MODE_RGMII_ID) \|\|`
	`167`	`+ if ((phydev->interface >= PHY_INTERFACE_MODE_RGMII_ID) &&`
`168`	`168`	`(phydev->interface <= PHY_INTERFACE_MODE_RGMII_RXID)) {`
`169`	`169`	`val = phy_read_mmd_indirect(phydev, DP83867_RGMIICTL,`
`170`	`170`	`DP83867_DEVADDR, phydev->addr);`