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.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 EE0E4C282C4 for ; Mon, 4 Feb 2019 21:09:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AAEA020811 for ; Mon, 4 Feb 2019 21:09:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a2yxzFmb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729514AbfBDVJW (ORCPT ); Mon, 4 Feb 2019 16:09:22 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53707 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728004AbfBDVJU (ORCPT ); Mon, 4 Feb 2019 16:09:20 -0500 Received: by mail-wm1-f65.google.com with SMTP id d15so1408207wmb.3 for ; Mon, 04 Feb 2019 13:09:19 -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=MA0AIIrNX6/jFQ/S7I7tsVrOdmvON/BwDJgap0jpVKQ=; b=a2yxzFmbmIIAfE3ZmFOkuGQHQNSQLtyj9hyCbVrUCKnLmGVThQFT6hZgpY+0v15onA Jv0mCZNo3JsfOKwwQU1wEkv+2te7WY4FIcxDJtULd/wac1GvfnX4EhKUJ1pv7nx8CvbH l8g5wMwoCGxdD37drFrEeNprjv1xufkn0AlrwvLBra8maUDYDeSVeWOmIqwZc0uYX3Fa f61Bc5C2SSoX7G4+R2kA3OmeqxUl5Zxq2s3VTBo8ovXgT4w/mHkxkKMUzbKHgIFOaI+7 jBfg4aDtSkcFvS6RTz7G9wAb9clHq2DoG8eouELAN46DfEMJZTmKgias7Ks9+mxH54i+ WKqQ== 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=MA0AIIrNX6/jFQ/S7I7tsVrOdmvON/BwDJgap0jpVKQ=; b=te0qdl/9chd/ypB/qibwtmCNHEhqALZnFe90fjPJi7RG3sPSVY3C9vozQYWGI6b63l QYcsMpUSoOFc6eAHsMN5D5o3uatiXkWYgcl14q0DOcOqLG1NcbqzIKzOrP5FUDVKp9k0 oYT5JaV4Nmft9P/RsF+MMNmBXgwMj6t0Hl1BsrAJYuwL6OXgRDJEV0MdTiHxGVno58sh P1th9zVWdJoSTg8UbbdvVucUwhiUzl70FuBXjVob//nAQ6fAnaS+auP04rXAU+R8lawF g2QTSayLBix2KXba+0vsDiduXPZ3CUDXCK38htP7JA+UGgFzQ/lZFbpmKPKgfeFu2wz7 1WZA== X-Gm-Message-State: AHQUAuajhhT6qIsUtR67FHcWmpGWcZtjZD/Ys83RmUibMkO0BhcA3JkI PBBxhtHNw8OUBNLxTbugYXIU+3Nk X-Google-Smtp-Source: AHgI3IZ9GKiKCJ2xIs+mcgBPPe6DagfeflLfzfb3LU6X/PHR0H74UCDUskkp3a2+YfGmhePKYQ5Wqw== X-Received: by 2002:a1c:f207:: with SMTP id s7mr910590wmc.87.1549314557954; Mon, 04 Feb 2019 13:09:17 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:79d1:9f16:256f:82a8? (p200300EA8BF1E20079D19F16256F82A8.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:79d1:9f16:256f:82a8]) by smtp.googlemail.com with ESMTPSA id g129sm17335971wmf.39.2019.02.04.13.09.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 13:09:17 -0800 (PST) Subject: [PATCH 3/3 net-next] net: phy: aquantia: use FIELD_GET for getting speed in aqr_read_status From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: Nikita Yushchenko , "netdev@vger.kernel.org" References: <8e41695d-a23e-adad-ae3d-66a46d1ab077@gmail.com> Message-ID: Date: Mon, 4 Feb 2019 22:09:06 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.0 MIME-Version: 1.0 In-Reply-To: <8e41695d-a23e-adad-ae3d-66a46d1ab077@gmail.com> 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 Change getting the speed to use FIELD_GET() too to be in line with the rest of the code. Signed-off-by: Heiner Kallweit --- drivers/net/phy/aquantia.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c index 7dfcbae4f..d8332b128 100644 --- a/drivers/net/phy/aquantia.c +++ b/drivers/net/phy/aquantia.c @@ -21,13 +21,13 @@ #define PHY_ID_AQR405 0x03a1b4b0 #define MDIO_AN_TX_VEND_STATUS1 0xc800 -#define MDIO_AN_TX_VEND_STATUS1_10BASET (0x0 << 1) -#define MDIO_AN_TX_VEND_STATUS1_100BASETX (0x1 << 1) -#define MDIO_AN_TX_VEND_STATUS1_1000BASET (0x2 << 1) -#define MDIO_AN_TX_VEND_STATUS1_10GBASET (0x3 << 1) -#define MDIO_AN_TX_VEND_STATUS1_2500BASET (0x4 << 1) -#define MDIO_AN_TX_VEND_STATUS1_5000BASET (0x5 << 1) -#define MDIO_AN_TX_VEND_STATUS1_RATE_MASK (0x7 << 1) +#define MDIO_AN_TX_VEND_STATUS1_RATE_MASK GENMASK(3, 1) +#define MDIO_AN_TX_VEND_STATUS1_10BASET 0 +#define MDIO_AN_TX_VEND_STATUS1_100BASETX 1 +#define MDIO_AN_TX_VEND_STATUS1_1000BASET 2 +#define MDIO_AN_TX_VEND_STATUS1_10GBASET 3 +#define MDIO_AN_TX_VEND_STATUS1_2500BASET 4 +#define MDIO_AN_TX_VEND_STATUS1_5000BASET 5 #define MDIO_AN_TX_VEND_STATUS1_FULL_DUPLEX BIT(0) #define MDIO_AN_TX_VEND_INT_STATUS2 0xcc01 @@ -148,7 +148,7 @@ static int aqr_read_status(struct phy_device *phydev) mdelay(10); reg = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_TX_VEND_STATUS1); - switch (reg & MDIO_AN_TX_VEND_STATUS1_RATE_MASK) { + switch (FIELD_GET(MDIO_AN_TX_VEND_STATUS1_RATE_MASK, reg)) { case MDIO_AN_TX_VEND_STATUS1_10GBASET: phydev->speed = SPEED_10000; break; -- 2.20.1