netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net: phy: dp83867: Fix warning check for setting the internal delay
@ 2015-07-21 17:06 Dan Murphy
  2015-07-21 17:14 ` Florian Fainelli
  2015-07-22  5:29 ` David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: Dan Murphy @ 2015-07-21 17:06 UTC (permalink / raw)
  To: netdev; +Cc: dcb314, f.fainelli, Dan Murphy

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 <dcb314@hotmail.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
 drivers/net/phy/dp83867.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index c7a12e2..8a3bf54 100644
--- 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);
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] net: phy: dp83867: Fix warning check for setting the internal delay
  2015-07-21 17:06 [PATCH] net: phy: dp83867: Fix warning check for setting the internal delay Dan Murphy
@ 2015-07-21 17:14 ` Florian Fainelli
  2015-07-22  5:29 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2015-07-21 17:14 UTC (permalink / raw)
  To: Dan Murphy, netdev; +Cc: dcb314

On 21/07/15 10:06, Dan Murphy wrote:
> 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 <dcb314@hotmail.com>
> Signed-off-by: Dan Murphy <dmurphy@ti.com>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>

> ---
>  drivers/net/phy/dp83867.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
> index c7a12e2..8a3bf54 100644
> --- 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);
> 


-- 
Florian

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] net: phy: dp83867: Fix warning check for setting the internal delay
  2015-07-21 17:06 [PATCH] net: phy: dp83867: Fix warning check for setting the internal delay Dan Murphy
  2015-07-21 17:14 ` Florian Fainelli
@ 2015-07-22  5:29 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2015-07-22  5:29 UTC (permalink / raw)
  To: dmurphy; +Cc: netdev, dcb314, f.fainelli

From: Dan Murphy <dmurphy@ti.com>
Date: Tue, 21 Jul 2015 12:06:45 -0500

> 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 <dcb314@hotmail.com>
> Signed-off-by: Dan Murphy <dmurphy@ti.com>

Applied, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-07-22  5:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-21 17:06 [PATCH] net: phy: dp83867: Fix warning check for setting the internal delay Dan Murphy
2015-07-21 17:14 ` Florian Fainelli
2015-07-22  5:29 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).