From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yx1-f50.google.com (mail-yx1-f50.google.com [74.125.224.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 416E451E420 for ; Mon, 7 Sep 2026 21:54:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788818100; cv=none; b=fufKymJpmrMKjlYAEbkN8/xoBU/Tru5Pslxw4D6yL6xx+Sswgrp4lzv4WiwQE/7cu/Plx20m5NzoC7JPvbkglh605jH60khK53P7RtDFMUqmrVK+hfoCzBvoRvnh1iTtbsLsh3HrfkJ+xbSOOol0nu+XlL5WglEI4EK8aN931TI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788818100; c=relaxed/simple; bh=E+Mq+ULNyxirXwXDZ7xaGocuqj9Hq20RZCcXQzzR7B0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JlLuMus8esHypKWljWRKSDVO7uQvy6fHIFf83sAjh2mEdajlLt54Ckzk8XEO6QQiRJp3x5dc98mEbDrp4h0GQ3h3qOJeEZOdIKYKnHKHhk2b4LwLrE+NY+0X8RV9AHcem1BiLZTRqcJ1X1W2yM1BZMeT+GKV+f86pzXMyVmD5X0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VEDdWO+g; arc=none smtp.client-ip=74.125.224.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VEDdWO+g" Received: by mail-yx1-f50.google.com with SMTP id 956f58d0204a3-66fdf2a9aacso1525234d50.0 for ; Mon, 07 Sep 2026 14:54:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788818088; x=1789422888; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=U8WIjdrmzAfceuartpDLM7+z5YZ8GSTaR8aMPWb/Pj4=; b=VEDdWO+gXRQbdBFam2f7xu+H+0Xhbkbd6nexacBnHSMcYOGt0pA5LU5DDOoD5aBSY+ YjSAlyBGMMceD6vueqTFXroFmsEC7rODL1//xRjKn0n2bBGhJ0PnnqnY/5UpClbSCqSW r9lQzPgItl3MwdyKqXq3JLX3aA/s8eZuYRw2fAnOczvQ+KyJLWF/7Org8I1yqXSLmDa3 pGXGvBi7JsYN6gO36svL4pMY+seFwswycoakZPNUoxmbJNSExaI0ZcS0tH27HTRIgHJ9 wiVXoATfts+xBVqSJ5CBjq8YtA+hyoSB0VIAXuV32Z8+DmWaq51U3wzmsdctAG3grCOw hlBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788818088; x=1789422888; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=U8WIjdrmzAfceuartpDLM7+z5YZ8GSTaR8aMPWb/Pj4=; b=LgKzqeZOHEUsPZlHO3Lxz9yo+QI5h9bO2fimV/BZFpx7UkwfSEnmK1wvzZFuKW1mZ5 ALtsaHhILeLSxWpPhjxRz+AMEiNm/v7gTkVRJ2HNcfFp3Mo9vdlAnlY+ESLnlQp/JaTv 3d0phZjx+tf2HQpLl1yJqAnBlqrtQ8KRe2fCS6wVlIAQdROhOmKZINrd4VPpgJ1SWt9o QjQei0MFvTAvgp3tdG23EutDPgbcGuhfENN6k17KK4jIdZceP+KRByENqUchpgoSstaW rp+9wYVdAtIx4R/arMDdUl2K6zY1Ks2+ZQmRafpUglbQ18mWN0aIG1u1Mm5apmM4/ase q60Q== X-Forwarded-Encrypted: i=1; AKwUvBzOSKsatSaVV3PcoEhmINYq0IazH1hVU43ozD4+YIq96ehUdoPbUqAlh6BZosdECcwcR2+7M/4=@vger.kernel.org X-Gm-Message-State: AFuF++nPw6J/7ZnPyQwU7ONXEV13/o50DlEihLW5RVLqtcfmV1zUdHUd aiC4d2TX4pTr8pPxA7SBhG+mmCImJXA8rG4zjl1AosfMigeekLgG/lY5 X-Gm-Gg: AYBFou2TwK53X2EPCa0Kc73Nj9AO5yR/QAAu+WH4gK8V50mC0RIaxvEPplqRcZ6TsAX PgWUg9FopwJe1VlFv/Fnd2Y/t7g3FCyh9Mw/g6qjpMcvlLdmvtsthoiiEwtwkhkVFyG0C20zeB+ zj1uYK8U+pztTX/KypUEZbMUmvbmxCLEqey5W9Q9kL2PcA8WEdSq2iiyOmzndatB9aoDLNBwpkU Wgm20ScvJUESmNunyUYodqBYymtFWOZzHIUsCGNxnf/AogcYmbzVD/HO3//8fZvxL9LnHvwmwED ZKD5/VIdqKRxT3+EsUnw3zfRfTKUgU983ihj9AyFfhhBLXyDzQTmCW41gqkH7GBPCDM8PRBwKGs lkft7tI4q4Buqti+9e7NZ4wAcs2RYsFT7j0jqv0BiPAqR4veTzqAIzTJNP/0gRWfeXR7/XUVaTd bNGurpfw0TBPGIXm4ZARhG68PsoSCGVYkAw5SdMYHZa0Gd04hqMJN09icxtW3zVEZlF5AKGxucv BFxZCH/wPgchqHR8Mj1SI48KhJs X-Received: by 2002:a53:d751:0:b0:66f:c1be:84f3 with SMTP id 956f58d0204a3-66fc1be873emr4452634d50.97.1788818087837; Mon, 07 Sep 2026 14:54:47 -0700 (PDT) Received: from localhost (c-73-105-0-191.hsd1.fl.comcast.net. [73.105.0.191]) by smtp.gmail.com with ESMTPSA id 00721157ae682-8714a87ead5sm77758477b3.28.2026.09.07.14.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2026 14:54:47 -0700 (PDT) From: Yury Norov X-Google-Original-From: Yury Norov To: Andrew Lunn , Heiner Kallweit , Russell King , Raju Rangoju , Prashanth Kumar K R , Tony Nguyen , Przemek Kitszel , Jian Shen , Jijie Shao , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-usb@vger.kernel.org Cc: Yury Norov , Yury Norov , Rasmus Villemoes , Andrew Morton Subject: [PATCH 7/9] net: phy: use linkmode operation return values in phy_device.c Date: Mon, 7 Sep 2026 17:54:36 -0400 Message-ID: <20260907215439.409858-8-ynorov@nvidia.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260907215439.409858-1-ynorov@nvidia.com> References: <20260907215439.409858-1-ynorov@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use the return value of linkmode_and() where the resulting mask was previously scanned for emptiness. In phy_probe(), combine the AND and AND-NOT operations and use the return value of linkmode_and_andnot(). Signed-off-by: Yury Norov --- drivers/net/phy/phy_device.c | 14 ++++++-------- include/linux/linkmode.h | 9 +++++++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 94b2e85e00a3..3430605695c5 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1565,8 +1565,7 @@ static int phy_sfp_module_insert(void *upstream, const struct sfp_eeprom_id *id) caps = sfp_get_module_caps(phydev->sfp_bus); - linkmode_and(sfp_support, port->supported, caps->link_modes); - if (linkmode_empty(sfp_support)) { + if (!linkmode_and(sfp_support, port->supported, caps->link_modes)) { dev_err(&phydev->mdio.dev, "incompatible SFP module inserted, no common linkmode\n"); return -EINVAL; } @@ -3761,15 +3760,14 @@ static int phy_probe(struct device *dev) /* Some PHYs may advertise, by default, not support EEE modes. So, * we need to clean them. In addition remove all disabled EEE modes. */ - linkmode_and(phydev->advertising_eee, phydev->supported_eee, - phydev->advertising_eee); - linkmode_andnot(phydev->advertising_eee, phydev->advertising_eee, - phydev->eee_disabled_modes); - /* There is no "enabled" flag. If PHY is advertising, assume it is * kind of enabled. */ - phydev->eee_cfg.eee_enabled = !linkmode_empty(phydev->advertising_eee); + phydev->eee_cfg.eee_enabled = + linkmode_and_andnot(phydev->advertising_eee, + phydev->advertising_eee, + phydev->supported_eee, + phydev->eee_disabled_modes); /* Get master/slave strap overrides */ of_set_phy_timing_role(phydev); diff --git a/include/linux/linkmode.h b/include/linux/linkmode.h index c08632c10c3d..49587a2e0f69 100644 --- a/include/linux/linkmode.h +++ b/include/linux/linkmode.h @@ -26,6 +26,15 @@ static inline bool linkmode_and(unsigned long *dst, const unsigned long *a, return bitmap_and(dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS); } +static inline bool linkmode_and_andnot(unsigned long *dst, + const unsigned long *a, + const unsigned long *b, + const unsigned long *c) +{ + return bitmap_and_andnot(dst, a, b, c, + __ETHTOOL_LINK_MODE_MASK_NBITS); +} + static inline void linkmode_or(unsigned long *dst, const unsigned long *a, const unsigned long *b) { -- 2.53.0