From: "Petr Štetiar" <ynezz@true.cz>
To: netdev@vger.kernel.org, devicetree@vger.kernel.org,
Nicolas Ferre <nicolas.ferre@microchip.com>,
"David S. Miller" <davem@davemloft.net>
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-kernel@vger.kernel.org
Subject: [PATCH v4 03/10] net: macb: support of_get_mac_address new ERR_PTR error
Date: Fri, 3 May 2019 16:27:08 +0200 [thread overview]
Message-ID: <1556893635-18549-4-git-send-email-ynezz@true.cz> (raw)
In-Reply-To: <1556893635-18549-1-git-send-email-ynezz@true.cz>
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 <ynezz@true.cz>
---
Changes since v2:
* ERR_PTR and EPROBE_DEFER handling
Changes since v3:
* IS_ERR_OR_NULL -> IS_ERR
drivers/net/ethernet/cadence/macb_main.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 3da2795..f0466e8 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -4172,15 +4172,13 @@ static int macb_probe(struct platform_device *pdev)
bp->rx_intr_mask |= MACB_BIT(RXUBR);
mac = of_get_mac_address(np);
- if (mac) {
+ if (PTR_ERR(mac) == -EPROBE_DEFER) {
+ err = -EPROBE_DEFER;
+ goto err_out_free_netdev;
+ } else if (!IS_ERR(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);
- }
+ macb_get_hwaddr(bp);
}
err = of_get_phy_mode(np);
--
1.9.1
next prev parent reply other threads:[~2019-05-03 14:36 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-03 14:27 [PATCH v4 00/10] of_net: Add NVMEM support to of_get_mac_address Petr Štetiar
2019-05-03 14:27 ` [PATCH v4 01/10] of_net: add " Petr Štetiar
2019-05-03 14:36 ` Maxime Ripard
2019-05-03 15:44 ` Petr Štetiar
2019-05-06 14:04 ` Maxime Ripard
2019-05-03 14:27 ` [PATCH v4 02/10] dt-bindings: doc: reflect new NVMEM of_get_mac_address behaviour Petr Štetiar
2019-05-07 16:44 ` Rob Herring
2019-05-08 8:41 ` Petr Štetiar
2019-05-08 11:48 ` Andrew Lunn
2019-05-03 14:27 ` Petr Štetiar [this message]
2019-05-03 14:27 ` [PATCH v4 04/10] net: davinci: support of_get_mac_address new ERR_PTR error Petr Štetiar
2019-05-03 14:27 ` [PATCH v4 06/10] net: usb: " Petr Štetiar
2019-05-03 14:27 ` [PATCH v4 07/10] net: wireless: " Petr Štetiar
2019-05-06 7:59 ` Kalle Valo
2019-05-03 14:27 ` [PATCH v4 08/10] staging: octeon-ethernet: " Petr Štetiar
2019-05-03 15:32 ` [PATCH v5] " Petr Štetiar
2019-05-03 14:27 ` [PATCH v4 09/10] ARM: Kirkwood: " Petr Štetiar
2019-05-03 14:27 ` [PATCH v4 10/10] powerpc: tsi108: " Petr Štetiar
2019-05-06 4:47 ` [PATCH v4 00/10] of_net: Add NVMEM support to of_get_mac_address David Miller
2019-05-06 8:32 ` Petr Štetiar
2019-05-06 14:41 ` Maxime Chevallier
2019-05-06 16:19 ` Petr Štetiar
2019-05-07 15:57 ` Rob Herring
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=1556893635-18549-4-git-send-email-ynezz@true.cz \
--to=ynezz@true.cz \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--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=maxime.ripard@bootlin.com \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=srinivas.kandagatla@linaro.org \
/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).