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 753E7C43381 for ; Thu, 14 Feb 2019 21:16:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 41F0E218FF for ; Thu, 14 Feb 2019 21:16:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Vj9d/nop" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437811AbfBNVQh (ORCPT ); Thu, 14 Feb 2019 16:16:37 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:54213 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392645AbfBNVQg (ORCPT ); Thu, 14 Feb 2019 16:16:36 -0500 Received: by mail-wm1-f66.google.com with SMTP id d15so7877411wmb.3 for ; Thu, 14 Feb 2019 13:16:35 -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=LImZ59Lvbv/Mq8QMp58yCqH96Ncc6FrGnPdnhaALMoo=; b=Vj9d/nopU9LnSgi5h5YxExCjlSYR9nGB55Xti1Cdjv3gfS5VE79UJBOIUaJqG1OV0Y zhctuzaJ0+NbyZIkAUEN7V+j0OW6r9dOOEp75HB9vuA0prn/oEKzJMK+7Tp1mwQGTBm8 rN+SJgKEvtFLZqNsUoBeh1xcxDX3ADcUcQc+SSB56PKbFamN9/M8YBIajJA2GW+dBgi1 2bXrY6yzFh4IGJJhgI55eTreIMCKVs02Wme36uuBTfaU/PpgXMjIiAhbKAhJKzfL26rd YoW+W4Am9iPvVxqloZnZrFkfZrVDyEO40U6UPdSc5T/99Nn68/Z6HtoJEpHHtyK5G/VW rQNQ== 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=LImZ59Lvbv/Mq8QMp58yCqH96Ncc6FrGnPdnhaALMoo=; b=Um3EFX+OkyzfCXZiiJTPMmbscsPJiulSi0sWXTP+Z5eWT6RDccqWxF/6IM8i1KyrG9 z682HdhenXkKBuyTRreGjipxS93RQjF+tDyIUcDWlFAO+Joqsjb9UUCugUrXuV6IgIz4 j7xh4gFhtlkmbRyuQx7XOOKm+A+d2uNfWVUaCe50X6BLyjhbBLJYb7R71zZfcYbTEYH1 Jh9MqnQqh7AKmHJjt2vqSdEbdU+FBbKsc+G9R1mtnbT7LIIjZGwxAs+gJNnoIxZhFpI9 7+1QfNvGYWndjwoJNJqZxHH+hp6LnwXppN4An3BJ1tOb8KL8K2fNg7BD8FqdDIQtgkXk cd8A== X-Gm-Message-State: AHQUAuYHQ+rvFW+qFRM3Hg/NaUN90vxQYQKmj6Unam+bq0f8F08Qi2wG 515u1GE5MjOefjOljgDLCPLFyUDn X-Google-Smtp-Source: AHgI3IbKX4Use7zzKBR+qkbVmkdTeb0da/x/wIS5bDlw632P6nDsEJV7NBSPBmnK9IvaXYM+idq/JA== X-Received: by 2002:a1c:2856:: with SMTP id o83mr4436233wmo.45.1550178994781; Thu, 14 Feb 2019 13:16:34 -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 y20sm5695128wra.51.2019.02.14.13.16.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 13:16:34 -0800 (PST) Subject: [PATCH net-next 2/2] net: phy: use phy_resolve_aneg_linkmode in genphy_read_status From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: <463d3ec9-e351-9f02-d0de-b64d8e3c9f08@gmail.com> Date: Thu, 14 Feb 2019 22:16:27 +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 Now that we have phy_resolve_aneg_linkmode() we can make genphy_read_status() much simpler. Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy_device.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 2c61282a2..d7ccbd94f 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1747,8 +1747,6 @@ int genphy_read_status(struct phy_device *phydev) int err; int lpa; int lpagb = 0; - int common_adv; - int common_adv_gb = 0; /* Update the link, but return if there was an error */ err = genphy_update_link(phydev); @@ -1780,7 +1778,6 @@ int genphy_read_status(struct phy_device *phydev) mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, lpagb); - common_adv_gb = lpagb & adv << 2; } lpa = phy_read(phydev, MII_LPA); @@ -1793,31 +1790,12 @@ int genphy_read_status(struct phy_device *phydev) if (adv < 0) return adv; - common_adv = lpa & adv; - phydev->speed = SPEED_10; phydev->duplex = DUPLEX_HALF; phydev->pause = 0; phydev->asym_pause = 0; - if (common_adv_gb & (LPA_1000FULL | LPA_1000HALF)) { - phydev->speed = SPEED_1000; - - if (common_adv_gb & LPA_1000FULL) - phydev->duplex = DUPLEX_FULL; - } else if (common_adv & (LPA_100FULL | LPA_100HALF)) { - phydev->speed = SPEED_100; - - if (common_adv & LPA_100FULL) - phydev->duplex = DUPLEX_FULL; - } else - if (common_adv & LPA_10FULL) - phydev->duplex = DUPLEX_FULL; - - if (phydev->duplex == DUPLEX_FULL) { - phydev->pause = lpa & LPA_PAUSE_CAP ? 1 : 0; - phydev->asym_pause = lpa & LPA_PAUSE_ASYM ? 1 : 0; - } + phy_resolve_aneg_linkmode(phydev); } else { int bmcr = phy_read(phydev, MII_BMCR); -- 2.20.1