From: "Petr Štetiar" <ynezz@true.cz>
To: netdev@vger.kernel.org, devicetree@vger.kernel.org,
Steve Glendinning <steve.glendinning@shawell.net>,
Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
Cc: "Andrew Lunn" <andrew@lunn.ch>,
"Florian Fainelli" <f.fainelli@gmail.com>,
"Heiner Kallweit" <hkallweit1@gmail.com>,
"Frank Rowand" <frowand.list@gmail.com>,
"Srinivas Kandagatla" <srinivas.kandagatla@linaro.org>,
"Maxime Ripard" <maxime.ripard@bootlin.com>,
"Petr Štetiar" <ynezz@true.cz>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 06/10] net: usb: support of_get_mac_address new ERR_PTR error
Date: Fri, 3 May 2019 09:56:03 +0200 [thread overview]
Message-ID: <1556870168-26864-7-git-send-email-ynezz@true.cz> (raw)
In-Reply-To: <1556870168-26864-1-git-send-email-ynezz@true.cz>
There was NVMEM support added to of_get_mac_address, so it could now
return NULL and 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 <ynezz@true.cz>
---
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..7acfa64 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_OR_NULL(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..841699f 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_OR_NULL(mac_addr)) {
memcpy(dev->net->dev_addr, mac_addr, ETH_ALEN);
return;
}
--
1.9.1
next prev parent reply other threads:[~2019-05-03 7:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-03 7:55 [PATCH v3 00/10] of_net: Add NVMEM support to of_get_mac_address Petr Štetiar
2019-05-03 7:55 ` [PATCH v3 01/10] of_net: add " Petr Štetiar
2019-05-03 8:44 ` Sergei Shtylyov
2019-05-03 9:15 ` Petr Štetiar
2019-05-03 9:36 ` Maxime Ripard
2019-05-03 12:05 ` Andrew Lunn
[not found] ` <1556870168-26864-1-git-send-email-ynezz-knWk7/PSn+s@public.gmane.org>
2019-05-03 7:55 ` [PATCH v3 02/10] dt-bindings: doc: reflect new NVMEM of_get_mac_address behaviour Petr Štetiar
2019-05-03 7:56 ` [PATCH v3 03/10] net: macb: support of_get_mac_address new ERR_PTR error Petr Štetiar
2019-05-03 7:56 ` [PATCH v3 04/10] net: davinci: " Petr Štetiar
2019-05-03 7:56 ` [PATCH v3 05/10] net: ethernet: " Petr Štetiar
2019-05-03 7:56 ` Petr Štetiar [this message]
2019-05-03 7:56 ` [PATCH v3 07/10] net: wireless: " Petr Štetiar
2019-05-03 7:56 ` [PATCH v3 08/10] staging: octeon-ethernet: " Petr Štetiar
2019-05-03 10:34 ` Dan Carpenter
2019-05-03 19:07 ` Petr Štetiar
2019-05-03 19:40 ` Dan Carpenter
2019-05-03 7:56 ` [PATCH v3 09/10] ARM: Kirkwood: " Petr Štetiar
2019-05-03 7:56 ` [PATCH v3 10/10] powerpc: tsi108: " Petr Štetiar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1556870168-26864-7-git-send-email-ynezz@true.cz \
--to=ynezz@true.cz \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=frowand.list@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=maxime.ripard@bootlin.com \
--cc=netdev@vger.kernel.org \
--cc=srinivas.kandagatla@linaro.org \
--cc=steve.glendinning@shawell.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).