Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1914389yba; Sat, 27 Apr 2019 09:46:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqxHrDd6TQsPuzrewEeLdZGzkNDhXlIfe1XkV9CTXRUsOq27QhRXS6vZUoSq+BVMVd2Ds3e4 X-Received: by 2002:a17:902:be12:: with SMTP id r18mr35561387pls.11.1556383590215; Sat, 27 Apr 2019 09:46:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556383590; cv=none; d=google.com; s=arc-20160816; b=XEHjVfWLuvgCk5o6DArvLoTQXaQU81geWbCOH+7z3sPrrTBYDvbvONNdQi7p3XaBTi LCne4tspwOD7SGt8zXkDVrCEJfHQPMusOGlfWj1EQ6CKCU9aYwsS/7LgvrJPmlqk+wAj hmglMQbeCQje8P3DMTv93LuPOSXAcgRHbqTrE20exSCrhAqLRizBtBB6IkRX7B8xFJk5 /Azn73z/aqw6D62jutV4pnGGyVgAuWMCTAM8ETw8Ou55NA3xBg6+BIzps7kjZVja7o7D CCX+iv/4Uf+0OslmNLiRUiBswQ2tgka3UQa+r8u3d4VHwD8CdK+rr8ocO+agV5hEiAB8 Ba2w== 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-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=2Jp8tW95qDDxhJZH0c/y0J2ffQAXfnnHhEYU95aDdek=; b=ltvn8CUYE7cHbM2XYMan+Y3WAJyRk1b90CYwkFF2e8NyTv6gDQF4VTgjcqEuQbD2+M KHQHjGKuF3QyN2RsAut53p6fsFb9LkDaSRKvTZdbVtKkK521Ie3VGATpJHP311QAq931 /TBzW7kQVH5BXil5f3U0T28d+6NWDbfvX5IbHC73MNBBWuf79asheF5TCC1iIyyf2Tsn y0hL7+FKdnOGHZUJFZWGkDQoS59CaVKwMEcMn/ljGFS0hZoz+D0FIYlylt+DyFEV2yiZ NmDtHcUuMinR0SEnhT1hOPv+3CKeBjQmauD7+8i6U4fhG5GP50bK7c7PudcjnCsRu28u AFXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@lunn.ch header.s=20171124 header.b=FC2bpsvz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 24si28557031pfi.21.2019.04.27.09.46.14; Sat, 27 Apr 2019 09:46:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@lunn.ch header.s=20171124 header.b=FC2bpsvz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726169AbfD0QoL (ORCPT + 99 others); Sat, 27 Apr 2019 12:44:11 -0400 Received: from vps0.lunn.ch ([185.16.172.187]:46685 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725942AbfD0QoL (ORCPT ); Sat, 27 Apr 2019 12:44:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lunn.ch; s=20171124; h=In-Reply-To:Content-Transfer-Encoding:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: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=2Jp8tW95qDDxhJZH0c/y0J2ffQAXfnnHhEYU95aDdek=; b=FC2bpsvzJiYgRT9gX0FEdNUmVG RsNrb2cWGmfKHkmfRFfzCN3G2PZozTN3rjmg6stuMwjeq+7H1BVRjIEjvBPBoj/3slz6OqJn0ttiU bqPhH6o0XQGP17XLLNQT8k7NEfrG45S8ay0EYSW1IuPew/vM31eBUO0lMGkuyesjMt70=; Received: from andrew by vps0.lunn.ch with local (Exim 4.89) (envelope-from ) id 1hKQQq-0002nR-Sr; Sat, 27 Apr 2019 18:44:08 +0200 Date: Sat, 27 Apr 2019 18:44:08 +0200 From: Andrew Lunn To: Petr =?utf-8?Q?=C5=A0tetiar?= Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolas Ferre , "David S. Miller" , Florian Fainelli , Heiner Kallweit , Rob Herring , Frank Rowand , Srinivas Kandagatla , Maxime Ripard , Alban Bedel Subject: Re: [PATCH 3/4] net: macb: Drop nvmem_get_mac_address usage Message-ID: <20190427164408.GD9816@lunn.ch> References: <1556320002-26213-1-git-send-email-ynezz@true.cz> <1556320002-26213-4-git-send-email-ynezz@true.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1556320002-26213-4-git-send-email-ynezz@true.cz> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Apr 27, 2019 at 01:06:41AM +0200, Petr Štetiar wrote: > of_get_mac_address now uses NVMEM under the hood, so it's not necessary > to call it manually anymore. > > Signed-off-by: Petr Štetiar > --- > drivers/net/ethernet/cadence/macb_main.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > index 3da2795..1b98bc8 100644 > --- a/drivers/net/ethernet/cadence/macb_main.c > +++ b/drivers/net/ethernet/cadence/macb_main.c > @@ -4172,16 +4172,10 @@ static int macb_probe(struct platform_device *pdev) > bp->rx_intr_mask |= MACB_BIT(RXUBR); > > mac = of_get_mac_address(np); > - if (mac) { > + if (mac) > ether_addr_copy(bp->dev->dev_addr, mac); > - } else { > - err = nvmem_get_mac_address(&pdev->dev, bp->dev->dev_addr); > - if (err) { > - if (err == -EPROBE_DEFER) > - goto err_out_free_netdev; > - macb_get_hwaddr(bp); > - } > - } Here we have an ordering problem. The current code looks for NVMEM after local-mac-address and mac-address. You change will make it look for NVMEM first. Andrew