Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp609537yba; Fri, 3 May 2019 07:39:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqzRabIPPZaH3qZGjXpyTgvZ18jh2+MCv34hJsT7k3mVkAyzx3Sh3T3QJIYmazD1y8XKvE+K X-Received: by 2002:a17:902:6946:: with SMTP id k6mr10931806plt.81.1556894362439; Fri, 03 May 2019 07:39:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556894362; cv=none; d=google.com; s=arc-20160816; b=Har9HcwCis9zZ2Jf6a3RmWeUS4tMPDtnJ8AV9g4cwKNPz/DeDOGUCl9cC9x94ctuVi 6+x9LVpr1W8bHFT2rDMKndXFm4V93iamS29CZ0EucJ1HfTShxuBtH6amxhGwVrdlQOEo ZoPC6SuMC0Qp9Ua8GI+GcnXWeCycZRciwGOTqktpD5YzRNWqZr10e/CBwG6HlDPDx6rI J1S3OHlJXaYKB7Qouhix84gaoftgAU2XQLj585EKTCzjnFXEqauBfdaihKGiNeBAhoyJ /qRlH53cu6GRbAs8x8GQxg8XmEZUGg8tjXVazmC+Zvi5lepqy/prtyzf3OZy4HXVXjDe QYFQ== 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=Ti9/wOlXQcQqmYEv0PpFHYsK7JxxJyHY0xNhRip5YCE=; b=HhcVLgRPhf7w8fFCxaSloCTbCqg587LDn85N0Zgv48TPCy1icMwCVkop/BwsiX4FxZ ylfpMW5ELAOQuLhqqiSqjjhREtW9H1oh768n7rFgjiETcXGnbR6a4Os/AWZaptJIYiIU XFSmM8HfxlQFZGfZcIY1nHRC2Kz6Q/n24Y+nOvra4oyXw7CHvpqVTk4RQT2B7t3wPkxI 691hZYAMLuIw4v+Vxbl2jFy2LcBEPDCOjr8dpGP6/ZytSHhT2qef+6/Mum1y1WfjZWE6 gjqKAhK+R0Xz9stTmgiyCFuyVVZcRrKhEt80LF7H7K7y9bswM8hnixcmPwwZYIq8mEyl 07GQ== 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 a2si2290106pgw.545.2019.05.03.07.39.07; Fri, 03 May 2019 07:39:22 -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 S1728182AbfECOfS (ORCPT + 99 others); Fri, 3 May 2019 10:35:18 -0400 Received: from smtp-out.xnet.cz ([178.217.244.18]:17091 "EHLO smtp-out.xnet.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728018AbfECOfR (ORCPT ); Fri, 3 May 2019 10:35:17 -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 8BAAE4ACD; Fri, 3 May 2019 16:27:33 +0200 (CEST) Received: by meh.true.cz (OpenSMTPD) with ESMTP id fc19d9f1; Fri, 3 May 2019 16:27:32 +0200 (CEST) From: =?UTF-8?q?Petr=20=C5=A0tetiar?= To: netdev@vger.kernel.org, devicetree@vger.kernel.org, Grygorii Strashko , "David S. Miller" Cc: Andrew Lunn , Florian Fainelli , Heiner Kallweit , Frank Rowand , Srinivas Kandagatla , Maxime Ripard , =?UTF-8?q?Petr=20=C5=A0tetiar?= , linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 04/10] net: davinci: support of_get_mac_address new ERR_PTR error Date: Fri, 3 May 2019 16:27:09 +0200 Message-Id: <1556893635-18549-5-git-send-email-ynezz@true.cz> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1556893635-18549-1-git-send-email-ynezz@true.cz> References: <1556893635-18549-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 There was NVMEM support added directly to of_get_mac_address, and it uses nvmem_get_mac_address under the hood, so we can remove it. As of_get_mac_address can now return ERR_PTR encoded error values, adjust to that as well. Signed-off-by: Petr Štetiar --- Changes since v2: * ERR_PTR handling Changes since v3: * IS_ERR_OR_NULL -> IS_ERR drivers/net/ethernet/ti/davinci_emac.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index 57450b1..c117a8f 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -1714,7 +1714,7 @@ static struct net_device_stats *emac_dev_getnetstats(struct net_device *ndev) if (!is_valid_ether_addr(pdata->mac_addr)) { mac_addr = of_get_mac_address(np); - if (mac_addr) + if (!IS_ERR(mac_addr)) ether_addr_copy(pdata->mac_addr, mac_addr); } @@ -1912,15 +1912,11 @@ static int davinci_emac_probe(struct platform_device *pdev) ether_addr_copy(ndev->dev_addr, priv->mac_addr); if (!is_valid_ether_addr(priv->mac_addr)) { - /* Try nvmem if MAC wasn't passed over pdata or DT. */ - rc = nvmem_get_mac_address(&pdev->dev, priv->mac_addr); - if (rc) { - /* Use random MAC if still none obtained. */ - eth_hw_addr_random(ndev); - memcpy(priv->mac_addr, ndev->dev_addr, ndev->addr_len); - dev_warn(&pdev->dev, "using random MAC addr: %pM\n", - priv->mac_addr); - } + /* Use random MAC if still none obtained. */ + eth_hw_addr_random(ndev); + memcpy(priv->mac_addr, ndev->dev_addr, ndev->addr_len); + dev_warn(&pdev->dev, "using random MAC addr: %pM\n", + priv->mac_addr); } ndev->netdev_ops = &emac_netdev_ops; -- 1.9.1