Received: by 2002:a25:d80d:0:0:0:0:0 with SMTP id p13csp206277ybg; Sat, 23 May 2020 11:38:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwk2XCSmPrPJlSdJdSkZYX7INyhdoQP39Mq+BAAaquB8ft/NxHpaySLTPokQj6gxZdejGbG X-Received: by 2002:a17:906:d148:: with SMTP id br8mr12444268ejb.356.1590259102918; Sat, 23 May 2020 11:38:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590259102; cv=none; d=google.com; s=arc-20160816; b=vHgcyuZm8dF9CGWpoXYlEJlO73xhCnM+ahps0uJ+xJcHF5VABapbIEQTyzYEhB61A7 4kASOPnfeVY3iMS08+rFaizG87w9QmuAU5Aj3b/5GAfjV3HiOa4I2XrZZkVaWX0bXIT9 tCpUCo3Z+ggmIMEtyDKwo97/1jU4ohht5LyDsoAsGMXvxO6dfSI9Qk0au5qxeh/oQitd 3PO09nXIgtmZaxe3IMafcL6SZQxRYD3y8mHbiAfRvZaKzEcqcSOSTwMWeln6LYe0jUer 2DXjdcVy1JzF/a6WDjsJjSRkUMVtIRwNVYZe4ByM/w3B0rw8c0NZy9vgaI0SVXHaz78O 934A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=Z4nh9DKykD3TLmRkQLhXGINWANLWLQznhBpN1bhFOIY=; b=g8zpo8HqTKWk9sauTm8EIRKal0s5srDthoSwpy95I3VfACu5y+o0yvuyLKibXuLuHi eaSRxIFvVJ3NBPMKMP9DEHt/Hf/fc5m/+KXded5xA9DGF+OZRLxL44dL7QH3YIi9xkOZ 0u6UbvK66XyU1xvoqrCTIoJsW4HC4t3ZovILsxqekhEjAADjUQWe+9WgUpSoq0/8Ltm5 VRvJP/fbkHUooungucfTLhpNkhI1R2WB1zDN1TbQKQQQHGLuhuoSPCSbw8pdSlGXoZUW YlvFeApi9XJAHh0nP/fqIh07l8c7IIpSBlz45ujeSn/fgWn+REwoAJuy7WQJwbdtiT31 oFeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@armlinux.org.uk header.s=pandora-2019 header.b=xf7EON0k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=armlinux.org.uk Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s28si6796862edc.202.2020.05.23.11.38.00; Sat, 23 May 2020 11:38:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@armlinux.org.uk header.s=pandora-2019 header.b=xf7EON0k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=armlinux.org.uk Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728319AbgEWSgT (ORCPT + 99 others); Sat, 23 May 2020 14:36:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727989AbgEWSgT (ORCPT ); Sat, 23 May 2020 14:36:19 -0400 Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [IPv6:2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB9F6C061A0E; Sat, 23 May 2020 11:36:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Sender:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Z4nh9DKykD3TLmRkQLhXGINWANLWLQznhBpN1bhFOIY=; b=xf7EON0kVmyLMQopvvNex6N6h PSmNtFS1y6RahuYIm5ZS+rA5L/fvQj6WbLi/YsdGVb1JM0SPwPSbrSYBpvAOn+ktn9H6n/D3XMume dOZo6wyi2gb/oHJVFTF17rXfj4GTyld0ari3Hc3ARkyQ8Ki0vyDDvFrxmabcxyY4DlT5Ac7YdR3WE O4q3ELTYPDwhvM4EAnVjvyjVlntGYZW/w2DPGDxBXh/NNwOnmK4m4fZP9KY0+JpceS4nYoSNk6AdU NdTANDYsFbfCme1V3A/uj9f/c3p1STV4WVmkwPYgD4hcKK94ZKcdlq5EHcz/TWnvmnbMSYwrY1tPk qkTA9hL3Q==; Received: from shell.armlinux.org.uk ([fd8f:7570:feb6:1:5054:ff:fe00:4ec]:36030) by pandora.armlinux.org.uk with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcZ0G-0000UN-UN; Sat, 23 May 2020 19:36:13 +0100 Received: from linux by shell.armlinux.org.uk with local (Exim 4.92) (envelope-from ) id 1jcZ0E-0002TP-PK; Sat, 23 May 2020 19:36:10 +0100 Date: Sat, 23 May 2020 19:36:10 +0100 From: Russell King - ARM Linux admin To: Jeremy Linton Cc: netdev@vger.kernel.org, davem@davemloft.net, andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, madalin.bucur@oss.nxp.com, calvin.johnson@oss.nxp.com, linux-kernel@vger.kernel.org Subject: Re: [RFC 02/11] net: phy: Simplify MMD device list termination Message-ID: <20200523183610.GY1551@shell.armlinux.org.uk> References: <20200522213059.1535892-1-jeremy.linton@arm.com> <20200522213059.1535892-3-jeremy.linton@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200522213059.1535892-3-jeremy.linton@arm.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, May 22, 2020 at 04:30:50PM -0500, Jeremy Linton wrote: > Since we are already checking for *devs == 0 after > the loop terminates, we can add a mostly F's check > as well. With that change we can simplify the return/break > sequence inside the loop. > > Add a valid_phy_id() macro for this, since we will be using it > in a couple other places. I'm not sure you have the name of this correct, and your usage layer in your patch series is correct. > > Signed-off-by: Jeremy Linton > --- > drivers/net/phy/phy_device.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c > index 245899b58a7d..7746c07b97fe 100644 > --- a/drivers/net/phy/phy_device.c > +++ b/drivers/net/phy/phy_device.c > @@ -695,6 +695,11 @@ static int get_phy_c45_devs_in_pkg(struct mii_bus *bus, int addr, int dev_addr, > return 0; > } > > +static bool valid_phy_id(int val) > +{ > + return (val > 0 && ((val & 0x1fffffff) != 0x1fffffff)); > +} > + > /** > * get_phy_c45_ids - reads the specified addr for its 802.3-c45 IDs. > * @bus: the target MII bus > @@ -732,18 +737,12 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id, > phy_reg = get_phy_c45_devs_in_pkg(bus, addr, 0, devs); > if (phy_reg < 0) > return -EIO; > - /* no device there, let's get out of here */ > - if ((*devs & 0x1fffffff) == 0x1fffffff) { > - *phy_id = 0xffffffff; > - return 0; > - } else { > - break; > - } > + break; > } > } > > /* no reported devices */ > - if (*devs == 0) { > + if (!valid_phy_id(*devs)) { You are using this to validate the "devices in package" value, not the PHY ID value. So, IMHO this should be called "valid_devs_in_package()" or similar. > *phy_id = 0xffffffff; > return 0; > } > -- > 2.26.2 > > -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC for 0.8m (est. 1762m) line in suburbia: sync at 13.1Mbps down 424kbps up