diff options
| author |   Petr Štetiar <ynezz@true.cz> | 2019-05-03 16:27:08 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-05-05 21:47:07 -0700 |
| commit | 541ddc66d665f0ed9e977f40bf99bb8bbf79d9c4 (patch) | |
| tree | dc6fe408021bec1ccffee9757f81894f6e7c770b /drivers/net/ethernet/cadence/macb_main.c | |
| parent | dt-bindings: doc: reflect new NVMEM of_get_mac_address behaviour (diff) | |
| download | linux-dev-541ddc66d665f0ed9e977f40bf99bb8bbf79d9c4.tar.xz linux-dev-541ddc66d665f0ed9e977f40bf99bb8bbf79d9c4.zip | |
net: macb: support of_get_mac_address new ERR_PTR error
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cadence/macb_main.c')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_main.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index bd6a62f4bd7d..5d5c9d70b2be 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -4137,15 +4137,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); |