From mboxrd@z Thu Jan 1 00:00:00 1970 From: Balakumaran Kannan Subject: [PATCH v3] net phylib: Remove unnecessary condition check in phy Date: Wed, 09 Apr 2014 09:03:45 +0530 Message-ID: <5344BF99.5090604@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit To: f.fainelli@gmail.com, netdev@vger.kernel.org, davem@davemloft.net Return-path: Received: from mail-pd0-f176.google.com ([209.85.192.176]:32816 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757645AbaDIDdu (ORCPT ); Tue, 8 Apr 2014 23:33:50 -0400 Received: by mail-pd0-f176.google.com with SMTP id r10so1868810pdi.21 for ; Tue, 08 Apr 2014 20:33:50 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: This condition check makes no difference in the code flow since 3.10 Signed-off-by: Balakumaran Kannan Reviewed-by: Florian Fainelli --- 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