Commit 9ca01b25 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

ethernet: use of_get_ethdev_address() 



Use the new of_get_ethdev_address() helper for the cases
where dev->dev_addr is passed in directly as the destination.

  @@
  expression dev, np;
  @@
  - of_get_mac_address(np, dev->dev_addr)
  + of_get_ethdev_address(np, dev)

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d466effe

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

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



	/* Read MAC-address from DT */

	ret = of_get_mac_address(np, ndev->dev_addr);

	ret = of_get_ethdev_address(np, ndev);

	if (ret) {

		/* if the MAC address is invalid get a random one */

		eth_hw_addr_random(ndev);

drivers/net/ethernet/altera/altera_tse_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1524,7 +1524,7 @@ static int altera_tse_probe(struct platform_device *pdev) 
	priv->rx_dma_buf_sz = ALTERA_RXDMABUFFER_SIZE;



	/* get default MAC address from device tree */

	ret = of_get_mac_address(pdev->dev.of_node, ndev->dev_addr);

	ret = of_get_ethdev_address(pdev->dev.of_node, ndev);

	if (ret)

		eth_hw_addr_random(ndev);

drivers/net/ethernet/arc/emac_main.c

+1 −1
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ int arc_emac_probe(struct net_device *ndev, int interface) 
	}



	/* Get MAC address from device tree */

	err = of_get_mac_address(dev->of_node, ndev->dev_addr);

	err = of_get_ethdev_address(dev->of_node, ndev);

	if (err)

		eth_hw_addr_random(ndev);

drivers/net/ethernet/atheros/ag71xx.c

+1 −1
Original line number Diff line number Diff line
@@ -1968,7 +1968,7 @@ static int ag71xx_probe(struct platform_device *pdev) 
	ag->stop_desc->ctrl = 0;

	ag->stop_desc->next = (u32)ag->stop_desc_dma;



	err = of_get_mac_address(np, ndev->dev_addr);

	err = of_get_ethdev_address(np, ndev);

	if (err) {

		netif_err(ag, probe, ndev, "invalid MAC address, using random address\n");

		eth_random_addr(ndev->dev_addr);

drivers/net/ethernet/broadcom/bcm4908_enet.c

+1 −1
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ static int bcm4908_enet_probe(struct platform_device *pdev) 
		return err;



	SET_NETDEV_DEV(netdev, &pdev->dev);

	err = of_get_mac_address(dev->of_node, netdev->dev_addr);

	err = of_get_ethdev_address(dev->of_node, netdev);

	if (err)

		eth_hw_addr_random(netdev);

	netdev->netdev_ops = &bcm4908_enet_netdev_ops;