microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2021-10-06 18:06:56 -07:00 коммит произвёл David S. Miller
Родитель d466effe28
Коммит 9ca01b25df
34 изменённых файлов: 34 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
drivers/net/ethernet/allwinner/sun4i-emac.c
Просмотреть файл

@ -852,7 +852,7 @@ static int emac_probe(struct platform_device *pdev)
} }
/* Read MAC-address from DT */ /* Read MAC-address from DT */
ret = of_get_mac_address(np, ndev->dev_addr); ret = of_get_ethdev_address(np, ndev);
if (ret) { if (ret) {
/* if the MAC address is invalid get a random one */ /* if the MAC address is invalid get a random one */
eth_hw_addr_random(ndev); eth_hw_addr_random(ndev);

2
drivers/net/ethernet/altera/altera_tse_main.c
Просмотреть файл

@ -1524,7 +1524,7 @@ static int altera_tse_probe(struct platform_device *pdev)
priv->rx_dma_buf_sz = ALTERA_RXDMABUFFER_SIZE; priv->rx_dma_buf_sz = ALTERA_RXDMABUFFER_SIZE;
/* get default MAC address from device tree */ /* 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) if (ret)
eth_hw_addr_random(ndev); eth_hw_addr_random(ndev);

2
drivers/net/ethernet/arc/emac_main.c
Просмотреть файл

@ -941,7 +941,7 @@ int arc_emac_probe(struct net_device *ndev, int interface)
} }
/* Get MAC address from device tree */ /* 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) if (err)
eth_hw_addr_random(ndev); eth_hw_addr_random(ndev);

2
drivers/net/ethernet/atheros/ag71xx.c
Просмотреть файл

@ -1968,7 +1968,7 @@ static int ag71xx_probe(struct platform_device *pdev)
ag->stop_desc->ctrl = 0; ag->stop_desc->ctrl = 0;
ag->stop_desc->next = (u32)ag->stop_desc_dma; 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) { if (err) {
netif_err(ag, probe, ndev, "invalid MAC address, using random address\n"); netif_err(ag, probe, ndev, "invalid MAC address, using random address\n");
eth_random_addr(ndev->dev_addr); eth_random_addr(ndev->dev_addr);

2
drivers/net/ethernet/broadcom/bcm4908_enet.c
Просмотреть файл

@ -715,7 +715,7 @@ static int bcm4908_enet_probe(struct platform_device *pdev)
return err; return err;
SET_NETDEV_DEV(netdev, &pdev->dev); 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) if (err)
eth_hw_addr_random(netdev); eth_hw_addr_random(netdev);
netdev->netdev_ops = &bcm4908_enet_netdev_ops; netdev->netdev_ops = &bcm4908_enet_netdev_ops;

2
drivers/net/ethernet/broadcom/bcmsysport.c
Просмотреть файл

@ -2555,7 +2555,7 @@ static int bcm_sysport_probe(struct platform_device *pdev)
} }
/* Initialize netdevice members */ /* Initialize netdevice members */
ret = of_get_mac_address(dn, dev->dev_addr); ret = of_get_ethdev_address(dn, dev);
if (ret) { if (ret) {
dev_warn(&pdev->dev, "using random Ethernet MAC\n"); dev_warn(&pdev->dev, "using random Ethernet MAC\n");
eth_hw_addr_random(dev); eth_hw_addr_random(dev);

2
drivers/net/ethernet/broadcom/bgmac-bcma.c
Просмотреть файл

@ -140,7 +140,7 @@ static int bgmac_probe(struct bcma_device *core)
bcma_set_drvdata(core, bgmac); 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) if (err == -EPROBE_DEFER)
return err; return err;

2
drivers/net/ethernet/broadcom/bgmac-platform.c
Просмотреть файл

@ -191,7 +191,7 @@ static int bgmac_probe(struct platform_device *pdev)
bgmac->dev = &pdev->dev; bgmac->dev = &pdev->dev;
bgmac->dma_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) if (ret == -EPROBE_DEFER)
return ret; return ret;

2
drivers/net/ethernet/cadence/macb_main.c
Просмотреть файл

@ -4774,7 +4774,7 @@ static int macb_probe(struct platform_device *pdev)
if (bp->caps & MACB_CAPS_NEEDS_RSTONUBR) if (bp->caps & MACB_CAPS_NEEDS_RSTONUBR)
bp->rx_intr_mask |= MACB_BIT(RXUBR); 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) if (err == -EPROBE_DEFER)
goto err_out_free_netdev; goto err_out_free_netdev;
else if (err) else if (err)

2
drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
Просмотреть файл

@ -1501,7 +1501,7 @@ static int octeon_mgmt_probe(struct platform_device *pdev)
netdev->min_mtu = 64 - OCTEON_MGMT_RX_HEADROOM; netdev->min_mtu = 64 - OCTEON_MGMT_RX_HEADROOM;
netdev->max_mtu = 16383 - OCTEON_MGMT_RX_HEADROOM - VLAN_HLEN; 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) if (result)
eth_hw_addr_random(netdev); eth_hw_addr_random(netdev);

2
drivers/net/ethernet/ethoc.c
Просмотреть файл

@ -1147,7 +1147,7 @@ static int ethoc_probe(struct platform_device *pdev)
eth_hw_addr_set(netdev, pdata->hwaddr); eth_hw_addr_set(netdev, pdata->hwaddr);
priv->phy_id = pdata->phy_id; priv->phy_id = pdata->phy_id;
} else { } 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; priv->phy_id = -1;
} }

2
drivers/net/ethernet/ezchip/nps_enet.c
Просмотреть файл

@ -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); dev_dbg(dev, "Registers base address is 0x%p\n", priv->regs_base);
/* set kernel MAC address to dev */ /* 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) if (err)
eth_hw_addr_random(ndev); eth_hw_addr_random(ndev);

2
drivers/net/ethernet/freescale/fec_mpc52xx.c
Просмотреть файл

@ -890,7 +890,7 @@ static int mpc52xx_fec_probe(struct platform_device *op)
* *
* First try to read MAC address from DT * 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) { if (rv) {
struct mpc52xx_fec __iomem *fec = priv->fec; struct mpc52xx_fec __iomem *fec = priv->fec;

2
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
Просмотреть файл

@ -1005,7 +1005,7 @@ static int fs_enet_probe(struct platform_device *ofdev)
spin_lock_init(&fep->lock); spin_lock_init(&fep->lock);
spin_lock_init(&fep->tx_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); ret = fep->ops->allocate_bd(ndev);
if (ret) if (ret)

2
drivers/net/ethernet/freescale/gianfar.c
Просмотреть файл

@ -753,7 +753,7 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
if (stash_len || stash_idx) if (stash_len || stash_idx)
priv->device_flags |= FSL_GIANFAR_DEV_HAS_BUF_STASHING; 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) { if (err) {
eth_hw_addr_random(dev); eth_hw_addr_random(dev);
dev_info(&ofdev->dev, "Using random MAC address: %pM\n", dev->dev_addr); dev_info(&ofdev->dev, "Using random MAC address: %pM\n", dev->dev_addr);

2
drivers/net/ethernet/freescale/ucc_geth.c
Просмотреть файл

@ -3731,7 +3731,7 @@ static int ucc_geth_probe(struct platform_device* ofdev)
goto err_free_netdev; goto err_free_netdev;
} }
of_get_mac_address(np, dev->dev_addr); of_get_ethdev_address(np, dev);
ugeth->ug_info = ug_info; ugeth->ug_info = ug_info;
ugeth->dev = device; ugeth->dev = device;

2
drivers/net/ethernet/hisilicon/hisi_femac.c
Просмотреть файл

@ -841,7 +841,7 @@ static int hisi_femac_drv_probe(struct platform_device *pdev)
(unsigned long)phy->phy_id, (unsigned long)phy->phy_id,
phy_modes(phy->interface)); phy_modes(phy->interface));
ret = of_get_mac_address(node, ndev->dev_addr); ret = of_get_ethdev_address(node, ndev);
if (ret) { if (ret) {
eth_hw_addr_random(ndev); eth_hw_addr_random(ndev);
dev_warn(dev, "using random MAC address %pM\n", dev_warn(dev, "using random MAC address %pM\n",

2
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
Просмотреть файл

@ -1219,7 +1219,7 @@ static int hix5hd2_dev_probe(struct platform_device *pdev)
goto out_phy_node; goto out_phy_node;
} }
ret = of_get_mac_address(node, ndev->dev_addr); ret = of_get_ethdev_address(node, ndev);
if (ret) { if (ret) {
eth_hw_addr_random(ndev); eth_hw_addr_random(ndev);
netdev_warn(ndev, "using random MAC address %pM\n", netdev_warn(ndev, "using random MAC address %pM\n",

2
drivers/net/ethernet/korina.c
Просмотреть файл

@ -1298,7 +1298,7 @@ static int korina_probe(struct platform_device *pdev)
if (mac_addr) if (mac_addr)
eth_hw_addr_set(dev, 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); eth_hw_addr_random(dev);
clk = devm_clk_get_optional(&pdev->dev, "mdioclk"); clk = devm_clk_get_optional(&pdev->dev, "mdioclk");

2
drivers/net/ethernet/lantiq_xrx200.c
Просмотреть файл

@ -527,7 +527,7 @@ static int xrx200_probe(struct platform_device *pdev)
return PTR_ERR(priv->clk); 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) if (err)
eth_hw_addr_random(net_dev); eth_hw_addr_random(net_dev);

2
drivers/net/ethernet/litex/litex_liteeth.c
Просмотреть файл

@ -266,7 +266,7 @@ static int liteeth_probe(struct platform_device *pdev)
priv->tx_base = buf_base + priv->num_rx_slots * priv->slot_size; priv->tx_base = buf_base + priv->num_rx_slots * priv->slot_size;
priv->tx_slot = 0; priv->tx_slot = 0;
err = of_get_mac_address(pdev->dev.of_node, netdev->dev_addr); err = of_get_ethdev_address(pdev->dev.of_node, netdev);
if (err) if (err)
eth_hw_addr_random(netdev); eth_hw_addr_random(netdev);

2
drivers/net/ethernet/marvell/mvneta.c
Просмотреть файл

@ -5242,7 +5242,7 @@ static int mvneta_probe(struct platform_device *pdev)
goto err_free_ports; goto err_free_ports;
} }
err = of_get_mac_address(dn, dev->dev_addr); err = of_get_ethdev_address(dn, dev);
if (!err) { if (!err) {
mac_from = "device tree"; mac_from = "device tree";
} else { } else {

2
drivers/net/ethernet/marvell/pxa168_eth.c
Просмотреть файл

@ -1434,7 +1434,7 @@ static int pxa168_eth_probe(struct platform_device *pdev)
INIT_WORK(&pep->tx_timeout_task, pxa168_eth_tx_timeout_task); INIT_WORK(&pep->tx_timeout_task, pxa168_eth_tx_timeout_task);
err = of_get_mac_address(pdev->dev.of_node, dev->dev_addr); err = of_get_ethdev_address(pdev->dev.of_node, dev);
if (err) { if (err) {
/* try reading the mac address, if set by the bootloader */ /* try reading the mac address, if set by the bootloader */
pxa168_eth_get_mac_address(dev, dev->dev_addr); pxa168_eth_get_mac_address(dev, dev->dev_addr);

2
drivers/net/ethernet/marvell/sky2.c
Просмотреть файл

@ -4720,7 +4720,7 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port,
* 1) from device tree data * 1) from device tree data
* 2) from internal registers set by bootloader * 2) from internal registers set by bootloader
*/ */
ret = of_get_mac_address(hw->pdev->dev.of_node, dev->dev_addr); ret = of_get_ethdev_address(hw->pdev->dev.of_node, dev);
if (ret) if (ret)
memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8, memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8,
ETH_ALEN); ETH_ALEN);

2
drivers/net/ethernet/mediatek/mtk_eth_soc.c
Просмотреть файл

@ -2588,7 +2588,7 @@ static int __init mtk_init(struct net_device *dev)
struct mtk_eth *eth = mac->hw; struct mtk_eth *eth = mac->hw;
int ret; int ret;
ret = of_get_mac_address(mac->of_node, dev->dev_addr); ret = of_get_ethdev_address(mac->of_node, dev);
if (ret) { if (ret) {
/* If the mac address is invalid, use random mac address */ /* If the mac address is invalid, use random mac address */
eth_hw_addr_random(dev); eth_hw_addr_random(dev);

2
drivers/net/ethernet/micrel/ks8851_common.c
Просмотреть файл

@ -195,7 +195,7 @@ static void ks8851_init_mac(struct ks8851_net *ks, struct device_node *np)
struct net_device *dev = ks->netdev; struct net_device *dev = ks->netdev;
int ret; int ret;
ret = of_get_mac_address(np, dev->dev_addr); ret = of_get_ethdev_address(np, dev);
if (!ret) { if (!ret) {
ks8851_write_mac_addr(dev); ks8851_write_mac_addr(dev);
return; return;

2
drivers/net/ethernet/nxp/lpc_eth.c
Просмотреть файл

@ -1350,7 +1350,7 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
__lpc_get_mac(pldat, ndev->dev_addr); __lpc_get_mac(pldat, ndev->dev_addr);
if (!is_valid_ether_addr(ndev->dev_addr)) { if (!is_valid_ether_addr(ndev->dev_addr)) {
of_get_mac_address(np, ndev->dev_addr); of_get_ethdev_address(np, ndev);
} }
if (!is_valid_ether_addr(ndev->dev_addr)) if (!is_valid_ether_addr(ndev->dev_addr))
eth_hw_addr_random(ndev); eth_hw_addr_random(ndev);

2
drivers/net/ethernet/qualcomm/qca_spi.c
Просмотреть файл

@ -968,7 +968,7 @@ qca_spi_probe(struct spi_device *spi)
spi_set_drvdata(spi, qcaspi_devs); spi_set_drvdata(spi, qcaspi_devs);
ret = of_get_mac_address(spi->dev.of_node, qca->net_dev->dev_addr); ret = of_get_ethdev_address(spi->dev.of_node, qca->net_dev);
if (ret) { if (ret) {
eth_hw_addr_random(qca->net_dev); eth_hw_addr_random(qca->net_dev);
dev_info(&spi->dev, "Using random MAC address: %pM\n", dev_info(&spi->dev, "Using random MAC address: %pM\n",

2
drivers/net/ethernet/qualcomm/qca_uart.c
Просмотреть файл

@ -347,7 +347,7 @@ static int qca_uart_probe(struct serdev_device *serdev)
of_property_read_u32(serdev->dev.of_node, "current-speed", &speed); of_property_read_u32(serdev->dev.of_node, "current-speed", &speed);
ret = of_get_mac_address(serdev->dev.of_node, qca->net_dev->dev_addr); ret = of_get_ethdev_address(serdev->dev.of_node, qca->net_dev);
if (ret) { if (ret) {
eth_hw_addr_random(qca->net_dev); eth_hw_addr_random(qca->net_dev);
dev_info(&serdev->dev, "Using random MAC address: %pM\n", dev_info(&serdev->dev, "Using random MAC address: %pM\n",

2
drivers/net/ethernet/renesas/ravb_main.c
Просмотреть файл

@ -132,7 +132,7 @@ static void ravb_read_mac_address(struct device_node *np,
{ {
int ret; int ret;
ret = of_get_mac_address(np, ndev->dev_addr); ret = of_get_ethdev_address(np, ndev);
if (ret) { if (ret) {
u32 mahr = ravb_read(ndev, MAHR); u32 mahr = ravb_read(ndev, MAHR);
u32 malr = ravb_read(ndev, MALR); u32 malr = ravb_read(ndev, MALR);

2
drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
Просмотреть файл

@ -118,7 +118,7 @@ static int sxgbe_platform_probe(struct platform_device *pdev)
} }
/* Get MAC address if available (DT) */ /* Get MAC address if available (DT) */
of_get_mac_address(node, priv->dev->dev_addr); of_get_ethdev_address(node, priv->dev);
/* Get the TX/RX IRQ numbers */ /* Get the TX/RX IRQ numbers */
for (i = 0, chan = 1; i < SXGBE_TX_QUEUES; i++) { for (i = 0, chan = 1; i < SXGBE_TX_QUEUES; i++) {

2
drivers/net/ethernet/socionext/sni_ave.c
Просмотреть файл

@ -1599,7 +1599,7 @@ static int ave_probe(struct platform_device *pdev)
ndev->max_mtu = AVE_MAX_ETHFRAME - (ETH_HLEN + ETH_FCS_LEN); ndev->max_mtu = AVE_MAX_ETHFRAME - (ETH_HLEN + ETH_FCS_LEN);
ret = of_get_mac_address(np, ndev->dev_addr); ret = of_get_ethdev_address(np, ndev);
if (ret) { if (ret) {
/* if the mac address is invalid, use random mac address */ /* if the mac address is invalid, use random mac address */
eth_hw_addr_random(ndev); eth_hw_addr_random(ndev);

2
drivers/net/ethernet/ti/netcp_core.c
Просмотреть файл

@ -2035,7 +2035,7 @@ static int netcp_create_interface(struct netcp_device *netcp_device,
devm_iounmap(dev, efuse); devm_iounmap(dev, efuse);
devm_release_mem_region(dev, res.start, size); devm_release_mem_region(dev, res.start, size);
} else { } else {
ret = of_get_mac_address(node_interface, ndev->dev_addr); ret = of_get_ethdev_address(node_interface, ndev);
if (ret) if (ret)
eth_random_addr(ndev->dev_addr); eth_random_addr(ndev->dev_addr);
} }

2
drivers/net/ethernet/xilinx/xilinx_emaclite.c
Просмотреть файл

@ -1157,7 +1157,7 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
lp->tx_ping_pong = get_bool(ofdev, "xlnx,tx-ping-pong"); lp->tx_ping_pong = get_bool(ofdev, "xlnx,tx-ping-pong");
lp->rx_ping_pong = get_bool(ofdev, "xlnx,rx-ping-pong"); lp->rx_ping_pong = get_bool(ofdev, "xlnx,rx-ping-pong");
rc = of_get_mac_address(ofdev->dev.of_node, ndev->dev_addr); rc = of_get_ethdev_address(ofdev->dev.of_node, ndev);
if (rc) { if (rc) {
dev_warn(dev, "No MAC address found, using random\n"); dev_warn(dev, "No MAC address found, using random\n");
eth_hw_addr_random(ndev); eth_hw_addr_random(ndev);