linuxmsm/laptops-kernel
0
0
Fork 0
mirror of https://github.com/linux-msm/laptops-kernel.git synced 2026-08-13 14:19:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

ethernet: use of_get_ethdev_address()

Browse Source 
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: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski
2021-10-07 13:39:51 +01:00
committed by David S. Miller
parent d466effe28
commit 9ca01b25df
34 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/ethernet/allwinner/sun4i-emac.c
+1 -1
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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;
drivers/net/ethernet/broadcom/bcmsysport.c
+1 -1
View File
@@ -2555,7 +2555,7 @@ static int bcm_sysport_probe(struct platform_device *pdev)
}
/* Initialize netdevice members */
ret = of_get_mac_address(dn, dev->dev_addr);
ret = of_get_ethdev_address(dn, dev);
if (ret) {
dev_warn(&pdev->dev, "using random Ethernet MAC\n");
eth_hw_addr_random(dev);
drivers/net/ethernet/broadcom/bgmac-bcma.c
+1 -1
View File
@@ -140,7 +140,7 @@ static int bgmac_probe(struct bcma_device *core)
bcma_set_drvdata(core, bgmac);
err = of_get_mac_address(bgmac->dev->of_node, bgmac->net_dev->dev_addr);
err = of_get_ethdev_address(bgmac->dev->of_node, bgmac->net_dev);
if (err == -EPROBE_DEFER)
return err;
drivers/net/ethernet/broadcom/bgmac-platform.c
+1 -1
View File
@@ -191,7 +191,7 @@ static int bgmac_probe(struct platform_device *pdev)
bgmac->dev = &pdev->dev;
bgmac->dma_dev = &pdev->dev;
ret = of_get_mac_address(np, bgmac->net_dev->dev_addr);
ret = of_get_ethdev_address(np, bgmac->net_dev);
if (ret == -EPROBE_DEFER)
return ret;
drivers/net/ethernet/cadence/macb_main.c
+1 -1
View File
@@ -4774,7 +4774,7 @@ static int macb_probe(struct platform_device *pdev)
if (bp->caps & MACB_CAPS_NEEDS_RSTONUBR)
bp->rx_intr_mask |= MACB_BIT(RXUBR);
err = of_get_mac_address(np, bp->dev->dev_addr);
err = of_get_ethdev_address(np, bp->dev);
if (err == -EPROBE_DEFER)
goto err_out_free_netdev;
else if (err)
drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
+1 -1
View File
@@ -1501,7 +1501,7 @@ static int octeon_mgmt_probe(struct platform_device *pdev)
netdev->min_mtu = 64 - OCTEON_MGMT_RX_HEADROOM;
netdev->max_mtu = 16383 - OCTEON_MGMT_RX_HEADROOM - VLAN_HLEN;
result = of_get_mac_address(pdev->dev.of_node, netdev->dev_addr);
result = of_get_ethdev_address(pdev->dev.of_node, netdev);
if (result)
eth_hw_addr_random(netdev);
drivers/net/ethernet/ethoc.c
+1 -1
View File
@@ -1147,7 +1147,7 @@ static int ethoc_probe(struct platform_device *pdev)
eth_hw_addr_set(netdev, pdata->hwaddr);
priv->phy_id = pdata->phy_id;
} else {
of_get_mac_address(pdev->dev.of_node, netdev->dev_addr);
of_get_ethdev_address(pdev->dev.of_node, netdev);
priv->phy_id = -1;
}
drivers/net/ethernet/ezchip/nps_enet.c
+1 -1
View File
@@ -601,7 +601,7 @@ static s32 nps_enet_probe(struct platform_device *pdev)
dev_dbg(dev, "Registers base address is 0x%p\n", priv->regs_base);
/* set kernel MAC address to dev */
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/freescale/fec_mpc52xx.c
+1 -1
View File
@@ -890,7 +890,7 @@ static int mpc52xx_fec_probe(struct platform_device *op)
*
* First try to read MAC address from DT
*/
rv = of_get_mac_address(np, ndev->dev_addr);
rv = of_get_ethdev_address(np, ndev);
if (rv) {
struct mpc52xx_fec __iomem *fec = priv->fec;
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+1 -1
View File
@@ -1005,7 +1005,7 @@ static int fs_enet_probe(struct platform_device *ofdev)
spin_lock_init(&fep->lock);
spin_lock_init(&fep->tx_lock);
of_get_mac_address(ofdev->dev.of_node, ndev->dev_addr);
of_get_ethdev_address(ofdev->dev.of_node, ndev);
ret = fep->ops->allocate_bd(ndev);
if (ret)
drivers/net/ethernet/freescale/gianfar.c
+1 -1
View File
@@ -753,7 +753,7 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
if (stash_len || stash_idx)
priv->device_flags |= FSL_GIANFAR_DEV_HAS_BUF_STASHING;
err = of_get_mac_address(np, dev->dev_addr);
err = of_get_ethdev_address(np, dev);
if (err) {
eth_hw_addr_random(dev);
dev_info(&ofdev->dev, "Using random MAC address: %pM\n", dev->dev_addr);
drivers/net/ethernet/freescale/ucc_geth.c
+1 -1
View File
@@ -3731,7 +3731,7 @@ static int ucc_geth_probe(struct platform_device* ofdev)
goto err_free_netdev;
}
of_get_mac_address(np, dev->dev_addr);
of_get_ethdev_address(np, dev);
ugeth->ug_info = ug_info;
ugeth->dev = device;
drivers/net/ethernet/hisilicon/hisi_femac.c
+1 -1
View File
@@ -841,7 +841,7 @@ static int hisi_femac_drv_probe(struct platform_device *pdev)
(unsigned long)phy->phy_id,
phy_modes(phy->interface));
ret = of_get_mac_address(node, ndev->dev_addr);
ret = of_get_ethdev_address(node, ndev);
if (ret) {
eth_hw_addr_random(ndev);
dev_warn(dev, "using random MAC address %pM\n",
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
+1 -1
View File
@@ -1219,7 +1219,7 @@ static int hix5hd2_dev_probe(struct platform_device *pdev)
goto out_phy_node;
}
ret = of_get_mac_address(node, ndev->dev_addr);
ret = of_get_ethdev_address(node, ndev);
if (ret) {
eth_hw_addr_random(ndev);
netdev_warn(ndev, "using random MAC address %pM\n",
drivers/net/ethernet/korina.c
+1 -1
View File
@@ -1298,7 +1298,7 @@ static int korina_probe(struct platform_device *pdev)
if (mac_addr)
eth_hw_addr_set(dev, mac_addr);
else if (of_get_mac_address(pdev->dev.of_node, dev->dev_addr) < 0)
else if (of_get_ethdev_address(pdev->dev.of_node, dev) < 0)
eth_hw_addr_random(dev);
clk = devm_clk_get_optional(&pdev->dev, "mdioclk");
drivers/net/ethernet/lantiq_xrx200.c
+1 -1
View File
@@ -527,7 +527,7 @@ static int xrx200_probe(struct platform_device *pdev)
return PTR_ERR(priv->clk);
}
err = of_get_mac_address(np, net_dev->dev_addr);
err = of_get_ethdev_address(np, net_dev);
if (err)
eth_hw_addr_random(net_dev);

Some files were not shown because too many files have changed in this diff Show More