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

Commit 2e7ae67b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'of_get_mac_address-ERR_PTR-fixes' 



Petr Štetiar says:

====================
of_get_mac_address ERR_PTR fixes

this patch series is an attempt to fix the mess, I've somehow managed to
introduce.

First patch in this series is defacto v5 of the previous 05/10 patch in the
series, but since the v4 of this 05/10 patch wasn't picked up by the
patchwork for some unknown reason, this patch wasn't applied with the other
9 patches in the series, so I'm resending it as a separate patch of this
fixup series again.

Second patch is a result of this rebase against net-next tree, where I was
checking again all current users of of_get_mac_address and found out, that
there's new one in DSA, so I've converted this user to the new ERR_PTR
encoded error value as well.

Third patch which was sent as v5 wasn't considered for merge, but I still
think, that we need to check for possible NULL value, thus current IS_ERR
check isn't sufficient and we need to use IS_ERR_OR_NULL instead.

Fourth patch fixes warning reported by kbuild test robot.
====================

Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Tested-by: default avatarLeonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8e8673a2 a51645f7

drivers/net/ethernet/aeroflex/greth.c

+1 −1
Original line number Diff line number Diff line
@@ -1459,7 +1459,7 @@ static int greth_of_probe(struct platform_device *ofdev) 
		const u8 *addr;



		addr = of_get_mac_address(ofdev->dev.of_node);

		if (addr) {

		if (!IS_ERR(addr)) {

			for (i = 0; i < 6; i++)

				macaddr[i] = (unsigned int) addr[i];

		} else {

drivers/net/ethernet/allwinner/sun4i-emac.c

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ static int emac_probe(struct platform_device *pdev) 


	/* Read MAC-address from DT */

	mac_addr = of_get_mac_address(np);

	if (mac_addr)

	if (!IS_ERR(mac_addr))

		memcpy(ndev->dev_addr, mac_addr, ETH_ALEN);



	/* Check if the MAC address is valid, if not get a random one */

drivers/net/ethernet/altera/altera_tse_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1537,7 +1537,7 @@ static int altera_tse_probe(struct platform_device *pdev) 


	/* get default MAC address from device tree */

	macaddr = of_get_mac_address(pdev->dev.of_node);

	if (macaddr)

	if (!IS_ERR(macaddr))

		ether_addr_copy(ndev->dev_addr, macaddr);

	else

		eth_hw_addr_random(ndev);

drivers/net/ethernet/arc/emac_main.c

+1 −1
Original line number Diff line number Diff line
@@ -960,7 +960,7 @@ int arc_emac_probe(struct net_device *ndev, int interface) 
	/* Get MAC address from device tree */

	mac_addr = of_get_mac_address(dev->of_node);



	if (mac_addr)

	if (!IS_ERR(mac_addr))

		memcpy(ndev->dev_addr, mac_addr, ETH_ALEN);

	else

		eth_hw_addr_random(ndev);

drivers/net/ethernet/aurora/nb8800.c

+1 −1
Original line number Diff line number Diff line
@@ -1463,7 +1463,7 @@ static int nb8800_probe(struct platform_device *pdev) 
	dev->irq = irq;



	mac = of_get_mac_address(pdev->dev.of_node);

	if (mac)

	if (!IS_ERR(mac))

		ether_addr_copy(dev->dev_addr, mac);



	if (!is_valid_ether_addr(dev->dev_addr))