[PATCH v2] net phylib: Remove unnecessary condition check

[PATCH v2] net phylib: Remove unnecessary condition check

[Balakumaran Kannan]

This condition check makes no difference in the code flow since 3.10

Signed-off-by: Balakumaran Kannan <kumaran.4353@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>

---
 drivers/net/phy/phy.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 1d788f1..1b6d09a 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -756,12 +756,8 @@ void phy_state_machine(struct work_struct *work)
			netif_carrier_on(phydev->attached_dev);
			phydev->adjust_link(phydev->attached_dev);

-		} else if (0 == phydev->link_timeout--) {
+		} else if (0 == phydev->link_timeout--)
			needs_aneg = 1;
-			/* If we have the magic_aneg bit, we try again */
-			if (phydev->drv->flags & PHY_HAS_MAGICANEG)
-				break;
-		}
		break;
	case PHY_NOLINK:
		err = phy_read_status(phydev);
-- 1.7.9.5 

Re: [PATCH v2] net phylib: Remove unnecessary condition check

[David Miller]

From: Balakumaran Kannan <kumaran.4353@gmail.com>
Date: Tue, 08 Apr 2014 20:51:05 +0530

> This condition check makes no difference in the code flow since 3.10
> 
> Signed-off-by: Balakumaran Kannan <kumaran.4353@gmail.com>
> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>

Your patch is still being corrupted by your email client.

> -			/* If we have the magic_aneg bit, we try again */
> -			if (phydev->drv->flags & PHY_HAS_MAGICANEG)
> -				break;
> -		}
> 		break;

On that break; line there should be a space then TAB characters in the patch,
instead there are only TAB characters.

Re: [PATCH v2] net phylib: Remove unnecessary condition check

[Balakumaran Kannan]

I'm sorry David. I'll correct those mistakes and send the patch. Sorry
for the inconvenience caused.

And thank you very much for your patience and noticing the mistakes clearly.

Regards,
Bala