From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH net-next 1/5] net: phy: remove useless check in state machine case PHY_NOLINK Date: Wed, 7 Nov 2018 20:43:20 +0100 Message-ID: <64cd8ce0-4f80-6444-cf7c-2c0971427785@gmail.com> References: <922c223b-7bc0-e0ec-345d-2034b796af91@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: "netdev@vger.kernel.org" To: Florian Fainelli , Andrew Lunn , David Miller Return-path: Received: from mail-wm1-f67.google.com ([209.85.128.67]:37521 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725945AbeKHFT5 (ORCPT ); Thu, 8 Nov 2018 00:19:57 -0500 Received: by mail-wm1-f67.google.com with SMTP id p2-v6so16768466wmc.2 for ; Wed, 07 Nov 2018 11:48:08 -0800 (PST) In-Reply-To: <922c223b-7bc0-e0ec-345d-2034b796af91@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: If aneg is enabled and the PHY reports the link as up then definitely aneg finished successfully. Therefore this check is useless and can be removed. Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 476578746..87c6d304c 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -970,17 +970,6 @@ void phy_state_machine(struct work_struct *work) break; if (phydev->link) { - if (AUTONEG_ENABLE == phydev->autoneg) { - err = phy_aneg_done(phydev); - if (err < 0) - break; - - if (!err) { - phydev->state = PHY_AN; - phydev->link_timeout = PHY_AN_TIMEOUT; - break; - } - } phydev->state = PHY_RUNNING; phy_link_up(phydev); } -- 2.19.1