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,URIBL_BLOCKED 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 DC5ECC282C4 for ; Sat, 9 Feb 2019 08:47:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A89582084D for ; Sat, 9 Feb 2019 08:47:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ajT/2kVZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726889AbfBIIrI (ORCPT ); Sat, 9 Feb 2019 03:47:08 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:52607 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726047AbfBIIrH (ORCPT ); Sat, 9 Feb 2019 03:47:07 -0500 Received: by mail-wm1-f65.google.com with SMTP id m1so7477656wml.2 for ; Sat, 09 Feb 2019 00:47:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=+jqGMSoIX+gjH8asP36xp7AYuPYWI2dwuVzdAKy9y0g=; b=ajT/2kVZoGUyKI4MD4iQ/5nLAwQMn8SLu5YONZRZsbeegckucyXcDP7PIG5UY6UG2y xmkBaTT6KYNYfsuniYwzALpqyDx/7ehzuw7N3lVhoPfnpf8J17OfY/Caa9hof2gM+hvI 7PV17WFlOQf7nBBp+DLwt1RBmPEPRzd9r+3v213Jgo11emmYKiJspZvRNO6jiM72X1m/ XdscwAQa0teUQ+hCNjzGZYFhVIFJyH6wCXbJ7q5ltthL4/7ZLwbU2Z6aa+6f++pdDCcZ rHsotKSDgvwNjOQhj2B5YNHNFE2Y0jyy6rVkVENkAWm4TFk5TOLMZ8ow99+1NqtfbVp1 WOSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=+jqGMSoIX+gjH8asP36xp7AYuPYWI2dwuVzdAKy9y0g=; b=ll8O2cO/AAhuoVcNj5SOb69ntT8spztu7wh5SYQLfFoEm6QRQmk74zVnvUWJaDxCA5 uPeinaZr8NGa1iF3WatGnUW4glQPEtypSD3FJ6UNcWHAL4ac/qJoqHCTVT9soFmPFVyp gsRxTf2oakpbAmZaw9FwFV1dsBb0iu4CKpo+cFjRvkooaIt9yHohmwgwXEDEZ6PKbu2s wU05Y7i6ek6++pMffhBPu05sPN8lByajYF0Nwj54i/3rtzKRcewxJR9t+K9J9PjpAFQD MSh43L//Yh3xdLZpe5gSx3iVJbsl3JLWDNmC+92QRpIH8bPt1VYS2eXj0d9C+n0mX4+f nJvw== X-Gm-Message-State: AHQUAuYFTiOxErEzsj+x4xuNY+DNI4AoEwntJQnp6z3EymaK6wc3xh9n WRR/VL4R0+gw4QbzEFIALgdF+xj+ X-Google-Smtp-Source: AHgI3IZg0wHiUU/jeyG5DTT+7yV3Mo8O5Duy48MA4tjPrbZ/K5W2ZECzYbkQ9rsFZPBU3ZnTSDVevQ== X-Received: by 2002:adf:e38e:: with SMTP id e14mr20990231wrm.142.1549702025171; Sat, 09 Feb 2019 00:47:05 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:aca4:3d:8205:4c97? (p200300EA8BF1E200ACA4003D82054C97.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:aca4:3d:8205:4c97]) by smtp.googlemail.com with ESMTPSA id m4sm2336457wml.2.2019.02.09.00.47.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Feb 2019 00:47:04 -0800 (PST) From: Heiner Kallweit Subject: [PATCH net-next] net: phy: remove unneeded masking of PHY register read results To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: <75c9d8ee-582f-f247-7595-d8732ac26c20@gmail.com> Message-ID: Date: Sat, 9 Feb 2019 09:46:53 +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 Reviewed-by: Andrew Lunn --- 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 d4fc1fd8a..31f9e7c49 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; /* Bit 0 doesn't represent a device, it indicates c22 regs presence */ *devices_in_package &= ~BIT(0); @@ -746,13 +746,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; @@ -789,14 +789,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