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 A006EC169C4 for ; Fri, 8 Feb 2019 19:22:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6BAE72081B for ; Fri, 8 Feb 2019 19:22:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lXz3J63T" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727660AbfBHTWf (ORCPT ); Fri, 8 Feb 2019 14:22:35 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39523 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727138AbfBHTWf (ORCPT ); Fri, 8 Feb 2019 14:22:35 -0500 Received: by mail-wm1-f67.google.com with SMTP id f16so4949712wmh.4 for ; Fri, 08 Feb 2019 11:22:33 -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=iQ02Lt6H60JvbxBA/fVXicULMCFnUpv7cyVvWmv8wm4=; b=lXz3J63TlVag+204DQJFZYnPs5U9ysFNVtvD9UnkMRkxe6tSOAEKD6/KIulTEitxuh ebqoXPQAFrDm0jWAOdOoz61MZjY3BxH5MsZZTEQzqCxmAOq7wjMth+RxAR0oYVPU7kN4 /JKBMzovDdwnwEhNn7gJhUDrIll8yjfJLxr6CNDGYnTxFkKuItBZ+1ctXSAL/DOH48Pn +77pqTv7SVxbwW6G3A5yzgbTyHeYHUnVRcV/OA+hL2BtK7uSamHYV8hY/3U2RHKVOHQn ogVao/TI+VDMr+sTQuOSmmVTJGt1kYqrhxIuqlJKTEcpafWkfu6gfW763s2A6kAkxTYL QFjA== 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=iQ02Lt6H60JvbxBA/fVXicULMCFnUpv7cyVvWmv8wm4=; b=ZYPwqNbaCXWH4SezjOP1k7mtpla4p9DXBFx5f9AjNxHrD9x+ioCLazuKi/d9gjRBEJ 00y+UPp4tioxP6Acncjo5dJ7b4nFjzOxjvVoIvX1weBdkP4S6mZeHcb5E9QXBoCDhFML v+YrU1I8GBMk4SqrYbTLxD1reufS/I6bsKUZGQde2afOb72eO2xKMvx0rRdRqfd4TS+K FpYGuJ3vjccN3o3jgsSD6Q7qmdNWs9x56AMCBceUMT7rAbqbQfa3b00DXtpcuSXwdb7g 4ECswYbfSHLbOqm7/jub4c5sMljAOUcZL5yxATl7mYF0+iTapjZHhkFMqUrywThAvrt5 DTmg== X-Gm-Message-State: AHQUAubjZVlVQmeXwuMbcQDxa372HaiYA/c6O3OEPCUTx6dCC1CtIgXV tuJKlxIeEpCy8sb0242BpxhXsZZA X-Google-Smtp-Source: AHgI3IbhQm61tcAWO9aZBAZ1I/m4W7a1d1GGvAaWL2DfSwrCZFQCMes/5SL5CgZuTUubpPoY/YNYnQ== X-Received: by 2002:a1c:dc02:: with SMTP id t2mr77203wmg.78.1549653752937; Fri, 08 Feb 2019 11:22:32 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:7cef:f5e9:d82c:bb62? (p200300EA8BF1E2007CEFF5E9D82CBB62.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:7cef:f5e9:d82c:bb62]) by smtp.googlemail.com with ESMTPSA id 90sm2532594wrk.95.2019.02.08.11.22.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Feb 2019 11:22:32 -0800 (PST) Subject: [PATCH v3 1/3 net-next] net: phy: remove unneeded masking of PHY register read results From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: <75c9d8ee-582f-f247-7595-d8732ac26c20@gmail.com> Message-ID: <3585a862-6a2c-87f8-63e8-bfb46708707e@gmail.com> Date: Fri, 8 Feb 2019 20:20:34 +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: <75c9d8ee-582f-f247-7595-d8732ac26c20@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 PHY registers are only 16 bits wide, therefore, if the read was successful, there's no need to mask out the higher 16 bits. Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy_device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 9369e1323..82dd72954 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -676,13 +676,13 @@ static int get_phy_c45_devs_in_pkg(struct mii_bus *bus, int addr, int dev_addr, phy_reg = mdiobus_read(bus, addr, reg_addr); if (phy_reg < 0) return -EIO; - *devices_in_package = (phy_reg & 0xffff) << 16; + *devices_in_package = phy_reg << 16; reg_addr = MII_ADDR_C45 | dev_addr << 16 | MDIO_DEVS1; phy_reg = mdiobus_read(bus, addr, reg_addr); if (phy_reg < 0) return -EIO; - *devices_in_package |= (phy_reg & 0xffff); + *devices_in_package |= phy_reg; return 0; } @@ -743,13 +743,13 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id, phy_reg = mdiobus_read(bus, addr, reg_addr); if (phy_reg < 0) return -EIO; - c45_ids->device_ids[i] = (phy_reg & 0xffff) << 16; + c45_ids->device_ids[i] = phy_reg << 16; reg_addr = MII_ADDR_C45 | i << 16 | MII_PHYSID2; phy_reg = mdiobus_read(bus, addr, reg_addr); if (phy_reg < 0) return -EIO; - c45_ids->device_ids[i] |= (phy_reg & 0xffff); + c45_ids->device_ids[i] |= phy_reg; } *phy_id = 0; return 0; @@ -786,14 +786,14 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id, return (phy_reg == -EIO || phy_reg == -ENODEV) ? -ENODEV : -EIO; } - *phy_id = (phy_reg & 0xffff) << 16; + *phy_id = phy_reg << 16; /* Grab the bits from PHYIR2, and put them in the lower half */ phy_reg = mdiobus_read(bus, addr, MII_PHYSID2); if (phy_reg < 0) return -EIO; - *phy_id |= (phy_reg & 0xffff); + *phy_id |= phy_reg; return 0; } -- 2.20.1