[PATCH net] Remove unnecessary condition check in phy

[PATCH net] Remove unnecessary condition check in phy

[Balakumaran Kannan]

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

Signed-off-by: Balakumaran Kannan <kumaran.4353@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 net] Remove unnecessary condition check in phy

[David Miller]

From: Balakumaran Kannan <kumaran.4353@gmail.com>
Date: Sat, 05 Apr 2014 13:00:16 +0530

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

The big questions is, was this intentional?

Re: [PATCH net] Remove unnecessary condition check in phy

[David Miller]

From: Balakumaran Kannan <kumaran.4353@gmail.com>
Date: Sat, 05 Apr 2014 13:00:16 +0530

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

This patch doesn't apply cleanly to the current tree.

It's because your email client corrupted the patch, changing
TAB characters into spaces amongst other things.

Also your subject line is not properly formed.  It should
state the subsystem after the closing bracket, followed
by ": " then the top-level description of your change.

Re: [PATCH net] Remove unnecessary condition check in phy

[Florian Fainelli]

2014-04-07 11:58 GMT-07:00 David Miller <davem@davemloft.net>:
> From: Balakumaran Kannan <kumaran.4353@gmail.com>
> Date: Sat, 05 Apr 2014 13:00:16 +0530
>
>> This condition check makes no difference in the code flow since 3.10
>>
>> Signed-off-by: Balakumaran Kannan <kumaran.4353@gmail.com>
>
> The big questions is, was this intentional?

It was before a33e6112d9b0 ("phy: Elimination the forced speed
reduction algorithm") because the PHY having PHY_HAS_MAGICANEG set
would not go through the PHY speed reduction algorithm. Now, this is
useless as there is a subsequent break and no conditional code based
on PHY_HAS_MAGICANEG (which means that we should also kill its usage
at some point).

Feel free to add my reviewed-by tag after fixing the mangling David spotted.

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

Re: [PATCH net] Remove unnecessary condition check in phy

[David Miller]

From: Florian Fainelli <f.fainelli@gmail.com>
Date: Mon, 7 Apr 2014 18:09:00 -0700

> 2014-04-07 11:58 GMT-07:00 David Miller <davem@davemloft.net>:
>> From: Balakumaran Kannan <kumaran.4353@gmail.com>
>> Date: Sat, 05 Apr 2014 13:00:16 +0530
>>
>>> This condition check makes no difference in the code flow since 3.10
>>>
>>> Signed-off-by: Balakumaran Kannan <kumaran.4353@gmail.com>
>>
>> The big questions is, was this intentional?
> 
> It was before a33e6112d9b0 ("phy: Elimination the forced speed
> reduction algorithm") because the PHY having PHY_HAS_MAGICANEG set
> would not go through the PHY speed reduction algorithm. Now, this is
> useless as there is a subsequent break and no conditional code based
> on PHY_HAS_MAGICANEG (which means that we should also kill its usage
> at some point).

Yep, I read through the history and that's why I noticed the patch didn't
apply, I was about to apply it :-)

> Feel free to add my reviewed-by tag after fixing the mangling David spotted.
> 
> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>

Will do, thanks Florian.