Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2643614yba; Sun, 28 Apr 2019 05:55:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqzJ/9q+6n6VVAehSVcR33N6vNLO9gU51CoR3aIPAUVvmFbZecl3ONtpNFbGdwi8jfWtudb/ X-Received: by 2002:a17:902:9304:: with SMTP id bc4mr57345732plb.312.1556456107884; Sun, 28 Apr 2019 05:55:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556456107; cv=none; d=google.com; s=arc-20160816; b=otwhfrAntygy0+elq/T1uwfMujfIO4BPvouDZ2ganG3/MkviILxCkK8rsQlCVnbOr+ egWp/DL0eip5zzosk28PLVjE13LvOfuidOnxLqJAes49xL4i18hXaIPi1Z5TLyuzRPbg 2Y/Suxg8pckfJYUKwO4vgIkgwy69iOSff4AhWIkQKmagTJTrWELTrfFShUvHQIhtb9+0 X8SE5tKKMJJahp6gLtmDvV93/lj4HgrPu09eaDNjNLSIfl5sFKUeUZH8WkuGdoGmIj8V T3SKkHeblpdMPcW8vrj0eVj3AxBhNSm6a3nGJd/8KgXoDAfhknFid6joWa0Oku3HgbAw keuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=UZ1PcHB4MXXq9ntl4VMmzNY65z4mlEMCmN6YgrJXlmM=; b=szuYOZCLyLrsOF2LeSFsI0PHYwnvIz3xEtZi3gUJMZxHCnXcxku5drv7aKSNXCC9MI mjIejXDM4QQXrNI95XOlOtOauYI7Bfg9M7jlJcYKs2Jn+3FeEmseB42C71PxWsvBsq8z iwZHpLAXuBm9y6QnzrGkchr6udtSMGP6oeN6rb+kALz5gjEXeDwklWLjwYLu5J/lXX1Y VdMO5skuNknbp7jnt5aLBeZmRUqOkIA0i54H+lNzzy4SkRr6iLaBSbOPuBxOLLoH2rPx aNSk2mK03AMKWVCGz+5DglC/ULNpyXy0hEep2+X9FqwyIE6PbO+UP1YulvqCNSAb5xLR gPjA== ARC-Authentication-Results: i=1; mx.google.com; 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 z6si29716833plo.372.2019.04.28.05.54.53; Sun, 28 Apr 2019 05:55:07 -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; 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 S1726814AbfD1Mxs (ORCPT + 99 others); Sun, 28 Apr 2019 08:53:48 -0400 Received: from smtp-out.xnet.cz ([178.217.244.18]:45707 "EHLO smtp-out.xnet.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726480AbfD1Mxr (ORCPT ); Sun, 28 Apr 2019 08:53:47 -0400 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id 135C04538; Sun, 28 Apr 2019 14:53:45 +0200 (CEST) Received: by meh.true.cz (OpenSMTPD) with ESMTP id 5f518601; Sun, 28 Apr 2019 14:53:43 +0200 (CEST) From: =?UTF-8?q?Petr=20=C5=A0tetiar?= To: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolas Ferre , "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Heiner Kallweit , Rob Herring , Frank Rowand , Srinivas Kandagatla , Maxime Ripard , Alban Bedel , =?UTF-8?q?Petr=20=C5=A0tetiar?= Subject: [PATCH v2 3/4] net: macb: Drop nvmem_get_mac_address usage Date: Sun, 28 Apr 2019 14:53:21 +0200 Message-Id: <1556456002-13430-4-git-send-email-ynezz@true.cz> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1556456002-13430-1-git-send-email-ynezz@true.cz> References: <1556456002-13430-1-git-send-email-ynezz@true.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); - } - } + else + macb_get_hwaddr(bp); err = of_get_phy_mode(np); if (err < 0) { -- 1.9.1