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

ethernet: use device_get_ethdev_address() 



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

  @@
  expression dev, np;
  @@
  - device_get_mac_address(np, dev->dev_addr, ETH_ALEN)
  + device_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 d9eb4490

drivers/net/ethernet/apm/xgene-v2/main.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static int xge_get_resources(struct xge_pdata *pdata) 
		return -ENOMEM;

	}



	if (device_get_mac_address(dev, ndev->dev_addr))

	if (device_get_ethdev_address(dev, ndev))

		eth_hw_addr_random(ndev);



	memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len);

drivers/net/ethernet/apm/xgene/xgene_enet_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1731,7 +1731,7 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) 
		xgene_get_port_id_acpi(dev, pdata);

#endif



	if (device_get_mac_address(dev, ndev->dev_addr))

	if (device_get_ethdev_address(dev, ndev))

		eth_hw_addr_random(ndev);



	memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len);

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+1 −1
Original line number Diff line number Diff line
@@ -4084,7 +4084,7 @@ static int bcmgenet_probe(struct platform_device *pdev) 
	if (pd && !IS_ERR_OR_NULL(pd->mac_address))

		eth_hw_addr_set(dev, pd->mac_address);

	else

		if (device_get_mac_address(&pdev->dev, dev->dev_addr))

		if (device_get_ethdev_address(&pdev->dev, dev))

			if (has_acpi_companion(&pdev->dev))

				bcmgenet_get_hw_addr(priv, dev->dev_addr);

drivers/net/ethernet/hisilicon/hns/hns_enet.c

+1 −1
Original line number Diff line number Diff line
@@ -1212,7 +1212,7 @@ static void hns_init_mac_addr(struct net_device *ndev) 
{

	struct hns_nic_priv *priv = netdev_priv(ndev);



	if (device_get_mac_address(priv->dev, ndev->dev_addr)) {

	if (device_get_ethdev_address(priv->dev, ndev)) {

		eth_hw_addr_random(ndev);

		dev_warn(priv->dev, "No valid mac, use random mac %pM",

			 ndev->dev_addr);