From mboxrd@z Thu Jan 1 00:00:00 1970 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.0 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 7F635C43381 for ; Thu, 14 Feb 2019 21:15:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43907218FF for ; Thu, 14 Feb 2019 21:15:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NJtamZTl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403967AbfBNVPm (ORCPT ); Thu, 14 Feb 2019 16:15:42 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39419 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392645AbfBNVPl (ORCPT ); Thu, 14 Feb 2019 16:15:41 -0500 Received: by mail-wm1-f67.google.com with SMTP id z84so390362wmg.4 for ; Thu, 14 Feb 2019 13:15:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=qYp1/o8eYJ3NTxoxyRViuAZAglIEqfpNtKADSFjVW8U=; b=NJtamZTldrO3HcOME4QTZXzQc6a+cD0Z2DpdjrRPM7Ljs524O2wtUGxWYyo/q6/0ur 6l4JU7xe9iiQHjxIMiw9203NJZGXJLFHs2u9z9Uz5J+JFBl+e3+Ts275UQiHGaHvTpO0 8S2dcLuCU4xZFf5ftnv5+y9A7wo/yOyvwIjviUTadoBYb/IuJsK1Xzg9jP7+MNsXrtfo XKVjrLSJ06suFZoFahxMcOKCo1TBPBK6Sj76wo5nN9QSgRfK8BONlcLKJcWSIYf0cROo WTx+OF48NlUdHgntrDyvtkgS4jxd/YwuW9EhhygHMCTGN8BUaJ+Vo2RBJjaID0L/GGiW s/Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=qYp1/o8eYJ3NTxoxyRViuAZAglIEqfpNtKADSFjVW8U=; b=pkPBHf/fBZcnnaEymWJ3SzGkwG7Ofskj+Cb6/mVgcb46lxCxvqBTrJZfMvCCcSU3wF XqQvNcxhpv0AMQa1sQTxPoLww1Zit+HblDNcRRdh5LBDFod+Myj++nbgnNgoxhXlXqR9 rGT7x2/FO0HdNV3jKqXfV0MjCu5sAfQMMYsb3xbhXFB4W/Zsxkc7CuGvrsevIGwDWnJ4 PGsEQUYoXAWOqEDjU05rmSIHIbvlAzJUkD5IWYvah88L7l/V5H9/KliIDvtup5ZZRBhL /PRZ6WGJyYG5Mnv/Np73qC+VoqBc70Wtn2VLcN/SCU/1yXr85NKpH22DC/TcGe++C0c8 WiZQ== X-Gm-Message-State: AHQUAuZlwuY00iBYGNQtSR+Y3VS0CDn12JL1aGuc2gUGREap8eNbHzSj /B46s/Aa0eVU0TH/vhl2Q1TlgPBC X-Google-Smtp-Source: AHgI3IY6U50czD7SdS3JAwjbqIn0XiZElaTrfzOzc4VaiuJDTp3l2puHwHqJ+7c+u3AqxTtydHZG6A== X-Received: by 2002:a1c:96c5:: with SMTP id y188mr4188320wmd.103.1550178939033; Thu, 14 Feb 2019 13:15:39 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:4185:fd13:4656:451e? (p200300EA8BF1E2004185FD134656451E.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:4185:fd13:4656:451e]) by smtp.googlemail.com with ESMTPSA id i12sm3311106wrq.21.2019.02.14.13.15.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 13:15:38 -0800 (PST) Subject: [PATCH net-next 1/2] net: phy: improve phy_resolve_aneg_linkmode From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: <1571d9d1-b3ad-8c96-a476-4ae18d20abfe@gmail.com> Date: Thu, 14 Feb 2019 22:15:31 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: 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 We have the settings array of modes which is sorted based on aneg priority. Instead of checking each mode manually let's simply iterate over the sorted settings. Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy-core.c | 43 +++++++------------------------------- 1 file changed, 7 insertions(+), 36 deletions(-) diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c index cdea028d1..5d43106fe 100644 --- a/drivers/net/phy/phy-core.c +++ b/drivers/net/phy/phy-core.c @@ -349,45 +349,16 @@ size_t phy_speeds(unsigned int *speeds, size_t size, void phy_resolve_aneg_linkmode(struct phy_device *phydev) { __ETHTOOL_DECLARE_LINK_MODE_MASK(common); + int i; linkmode_and(common, phydev->lp_advertising, phydev->advertising); - if (linkmode_test_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, common)) { - phydev->speed = SPEED_10000; - phydev->duplex = DUPLEX_FULL; - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, - common)) { - phydev->speed = SPEED_5000; - phydev->duplex = DUPLEX_FULL; - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, - common)) { - phydev->speed = SPEED_2500; - phydev->duplex = DUPLEX_FULL; - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, - common)) { - phydev->speed = SPEED_1000; - phydev->duplex = DUPLEX_FULL; - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, - common)) { - phydev->speed = SPEED_1000; - phydev->duplex = DUPLEX_HALF; - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, - common)) { - phydev->speed = SPEED_100; - phydev->duplex = DUPLEX_FULL; - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, - common)) { - phydev->speed = SPEED_100; - phydev->duplex = DUPLEX_HALF; - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT, - common)) { - phydev->speed = SPEED_10; - phydev->duplex = DUPLEX_FULL; - } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, - common)) { - phydev->speed = SPEED_10; - phydev->duplex = DUPLEX_HALF; - } + for (i = 0; i < ARRAY_SIZE(settings); i++) + if (test_bit(settings[i].bit, common)) { + phydev->speed = settings[i].speed; + phydev->duplex = settings[i].duplex; + break; + } if (phydev->duplex == DUPLEX_FULL) { phydev->pause = linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT, -- 2.20.1