Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 541ddc66 authored by Petr Štetiar's avatar Petr Štetiar Committed by David S. Miller
Browse files

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: default avatarPetr Štetiar <ynezz@true.cz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 687e3d55

drivers/net/ethernet/cadence/macb_main.c

+5 −7
Original line number Diff line number Diff line
@@ -4137,16 +4137,14 @@ 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);

	}

	}



	err = of_get_phy_mode(np);

	if (err < 0)