Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F339C43387 for ; Wed, 16 Jan 2019 18:48:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E2DEC20840 for ; Wed, 16 Jan 2019 18:48:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QX/m25Ie" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729527AbfAPSsQ (ORCPT ); Wed, 16 Jan 2019 13:48:16 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:36105 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729483AbfAPSsQ (ORCPT ); Wed, 16 Jan 2019 13:48:16 -0500 Received: by mail-wm1-f67.google.com with SMTP id p6so3141421wmc.1 for ; Wed, 16 Jan 2019 10:48:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=vMF/LUeqtKQwqO3BUAVbMFxWNejLvoE0sziw9Cypwnk=; b=QX/m25IeEyZ/x+kacRUy/fmeRN5dmke7AA3d7omTdOd49hEfiz/bgkM1AcNmtiMVPk yHHWO2j3fw9WSo6mR+bFsd8FHlgHXq6vPSJgJWfVGZIm2w5QmBGB3rPList/KAnEe+Fx dVEvHlBGblEQpGg5tmqRnKF0g0WK3Y5A/TD6dj43q7+HCFeRwOZsj/xb8/HxjAPEV8F0 7f6i1uyBxRSu+i8O89hZC1qNghBP8GxUQf8rR5JiPhZSh7dsyKT9PagqRe5OsX8b5k7N 69WIJhP4KeY+khcHDzzEcXXsXMsDJYbqXkK1sdCS24ZQu7hUdZ2Tdp0c8wnqLVY/Nyfn lpLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=vMF/LUeqtKQwqO3BUAVbMFxWNejLvoE0sziw9Cypwnk=; b=hAa2QFpHlgHahL1eCVMNENLBwQ1mEFYDULImQKNPs994TuiHVs6mvYvR8afGXg3/UK a91FU+zHVY8XY+GXc3d7LBWfTryQmkWme6juWw2f2tSRrswIWM8N2grTiRq4+bPz+iBu BOY2x6HH08a56qnt22Y06hP7nM5Cn+9dKImJeoLSg0/PU2CO5zmWzNkJlgjBw2pv3oRx op5hIJmJqLVGL8wA398mpouDzbbbZzA9UCoV0C3oydlBytyIJENENYNnfvw9gO6CFwMG Plj+AdEfZyEcwnMYxxsD3tPmZX/CV4ftHNtGXzrUW5abMQZQa7n1bbfg4k7yVgRvmGuU PujA== X-Gm-Message-State: AJcUukdxhJfr2YFnt/59gW1syz8ogdlgjy8di4MNmCxvf9P8BlBU4dvS 5uiEJl0J9NcRxW/kZ+mWUD1m7wD1 X-Google-Smtp-Source: ALg8bN5HmwBWaiFPHnmtbF3AXmS8gojKJP7smAvQeXNJ8TxTb8nIe7kWeposDsSVVhuvenFhzY21zg== X-Received: by 2002:a7b:ce84:: with SMTP id q4mr9124017wmj.105.1547664494061; Wed, 16 Jan 2019 10:48:14 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:75ce:7fb:35bc:2da7? (p200300EA8BF1E20075CE07FB35BC2DA7.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:75ce:7fb:35bc:2da7]) by smtp.googlemail.com with ESMTPSA id p5sm20732354wmh.16.2019.01.16.10.48.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 10:48:13 -0800 (PST) From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" Subject: [PATCH net-next] net: phy: remove state PHY_CHANGELINK Message-ID: <98aef9c4-1dc5-e2fa-fea4-4dc2b6fc255c@gmail.com> Date: Wed, 16 Jan 2019 19:47:57 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since recent changes to the phylib state machine state PHY_CHANGELINK isn't used any longer. Therefore let's remove it. Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy.c | 2 -- include/linux/phy.h | 6 ------ 2 files changed, 8 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 304f0b7e6..2ffe08537 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -47,7 +47,6 @@ static const char *phy_state_to_str(enum phy_state st) PHY_STATE_STR(RUNNING) PHY_STATE_STR(NOLINK) PHY_STATE_STR(FORCING) - PHY_STATE_STR(CHANGELINK) PHY_STATE_STR(HALTED) PHY_STATE_STR(RESUMING) } @@ -934,7 +933,6 @@ void phy_state_machine(struct work_struct *work) break; case PHY_NOLINK: case PHY_RUNNING: - case PHY_CHANGELINK: case PHY_RESUMING: err = phy_check_link_status(phydev); break; diff --git a/include/linux/phy.h b/include/linux/phy.h index 3b051f761..00b0533de 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -304,11 +304,6 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr); * - irq or timer will set NOLINK if link goes down * - phy_stop moves to HALTED * - * CHANGELINK: PHY experienced a change in link state - * - timer moves to RUNNING if link - * - timer moves to NOLINK if the link is down - * - phy_stop moves to HALTED - * * HALTED: PHY is up, but no polling or interrupts are done. Or * PHY is in an error state. * @@ -327,7 +322,6 @@ enum phy_state { PHY_RUNNING, PHY_NOLINK, PHY_FORCING, - PHY_CHANGELINK, PHY_RESUMING }; -- 2.20.1