Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp608610yba; Fri, 3 May 2019 07:38:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqxAT6efKOkq/VUYajc0McXeAEAvTwt03DCk+Cxh9B3sZsyWtFpv4wW5tivnI76I0WUmH8Tl X-Received: by 2002:a63:ff18:: with SMTP id k24mr10967527pgi.140.1556894311155; Fri, 03 May 2019 07:38:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556894311; cv=none; d=google.com; s=arc-20160816; b=fKprGHzXp+ADDPH0wI8TvtsKySi2gffDAc7vIQYnkl4Bq4r1Of7uucLYmmPgpm3at/ UaViAghsFnD6d0towpjrv1CoGaf5Ar2aFCHwvrd0Esc5HEKFP07iT0gdUyvVpdmGWn5t VQVLsJyDhG3wab6tGThM5qAybrFTYrkOaD2oOW1ue0Yzw8k28I308q80l9ms14wXjnbs 42RC+m2XdCyOwNP8VjijvQXUl7XfxoNzoKhT3YTIIqcW6BHeD2ShHEXugBtvV9WXIg1s w0iHG6+hGze6k+579ExaXd8wTgZ5qC8/VebExcSg0XqAIC+LD2jYLZjT/5zqaC1A1CXG wbag== 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=SVrHrUH2sp8xld6au4UCqafKXmrtJQKofD9dwH/cceo=; b=tKJMSSFo4+DYIBrJwRJysiV4p8I/jFqu/630/SGDHRvC070hNPSst59E7uiVB5J817 tx1cthtQqdXT5R1QDtDJvqPFBRc5QGt+ExUggGwa0ED0/ELrXiH/jbDwcuvq2phwcU5h bn2p2N2c+yn899MAscKFkKInqHTvIthK2GVYH19qPfo70X/HeU6BnyaPhk9x5ManUB+D +/NV0gY2MTjLFTiaUFUiF/3LtIWpPdGoSdxu/rvQED8p21OUXVxf88TYtxD64i9QYEZM EBhNhHCxdyrA345LBQeZKaidtjdrOLGFRP+5K6qUZRph/gm1kLDJLbiRxmX+YjKBM7Zg oAjA== 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 k9si2528672pgs.101.2019.05.03.07.38.14; Fri, 03 May 2019 07:38:31 -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 S1728327AbfECOge (ORCPT + 99 others); Fri, 3 May 2019 10:36:34 -0400 Received: from smtp-out.xnet.cz ([178.217.244.18]:17096 "EHLO smtp-out.xnet.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728020AbfECOfR (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 A44DC4AD0; Fri, 3 May 2019 16:27:44 +0200 (CEST) Received: by meh.true.cz (OpenSMTPD) with ESMTP id 037e069d; Fri, 3 May 2019 16:27:43 +0200 (CEST) From: =?UTF-8?q?Petr=20=C5=A0tetiar?= To: netdev@vger.kernel.org, devicetree@vger.kernel.org, Steve Glendinning , "David S. Miller" , Microchip Linux Driver Support Cc: Andrew Lunn , Florian Fainelli , Heiner Kallweit , Frank Rowand , Srinivas Kandagatla , Maxime Ripard , =?UTF-8?q?Petr=20=C5=A0tetiar?= , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 06/10] net: usb: support of_get_mac_address new ERR_PTR error Date: Fri, 3 May 2019 16:27:11 +0200 Message-Id: <1556893635-18549-7-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 to of_get_mac_address, so it could now return ERR_PTR encoded error values, so we need to adjust all current users of of_get_mac_address to this new fact. Signed-off-by: Petr Štetiar --- Changes since v3: * IS_ERR_OR_NULL -> IS_ERR drivers/net/usb/smsc75xx.c | 2 +- drivers/net/usb/smsc95xx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index ec287c9..d27b627 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c @@ -774,7 +774,7 @@ static void smsc75xx_init_mac_address(struct usbnet *dev) /* maybe the boot loader passed the MAC address in devicetree */ mac_addr = of_get_mac_address(dev->udev->dev.of_node); - if (mac_addr) { + if (!IS_ERR(mac_addr)) { memcpy(dev->net->dev_addr, mac_addr, ETH_ALEN); return; } diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index e3d08626..ab23911 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -917,7 +917,7 @@ static void smsc95xx_init_mac_address(struct usbnet *dev) /* maybe the boot loader passed the MAC address in devicetree */ mac_addr = of_get_mac_address(dev->udev->dev.of_node); - if (mac_addr) { + if (!IS_ERR(mac_addr)) { memcpy(dev->net->dev_addr, mac_addr, ETH_ALEN); return; } -- 1.9.1