Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: ethernet: Remove superfluous ether_setup after alloc_etherdev

There is no need to call ether_setup after alloc_ethdev since it was
already called there.

Follow commits c706471b2601 ("net: axienet: remove unnecessary
ether_setup after alloc_etherdev") and 3c87dcbfb36c ("net: ll_temac:
Remove unnecessary ether_setup after alloc_etherdev") and fix the
pattern in all remaining ethernet drivers.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Tobias Klauser and committed by
David S. Miller
6a05880a c2bf5ec2

-34
-3
drivers/net/ethernet/adi/bfin_mac.c
··· 1692 1692 lp->vlan1_mask = ETH_P_8021Q | mii_bus_data->vlan1_mask; 1693 1693 lp->vlan2_mask = ETH_P_8021Q | mii_bus_data->vlan2_mask; 1694 1694 1695 - /* Fill in the fields of the device structure with ethernet values. */ 1696 - ether_setup(ndev); 1697 - 1698 1695 ndev->netdev_ops = &bfin_mac_netdev_ops; 1699 1696 ndev->ethtool_ops = &bfin_mac_ethtool_ops; 1700 1697
-2
drivers/net/ethernet/allwinner/sun4i-emac.c
··· 878 878 emac_powerup(ndev); 879 879 emac_reset(db); 880 880 881 - ether_setup(ndev); 882 - 883 881 ndev->netdev_ops = &emac_netdev_ops; 884 882 ndev->watchdog_timeo = msecs_to_jiffies(watchdog); 885 883 ndev->ethtool_ops = &emac_ethtool_ops;
-1
drivers/net/ethernet/altera/altera_tse_main.c
··· 1433 1433 goto err_free_netdev; 1434 1434 1435 1435 /* initialize netdev */ 1436 - ether_setup(ndev); 1437 1436 ndev->mem_start = control_port->start; 1438 1437 ndev->mem_end = control_port->end; 1439 1438 ndev->netdev_ops = &altera_tse_netdev_ops;
-1
drivers/net/ethernet/cadence/at91_ether.c
··· 351 351 if (res) 352 352 goto err_disable_clock; 353 353 354 - ether_setup(dev); 355 354 dev->netdev_ops = &at91ether_netdev_ops; 356 355 dev->ethtool_ops = &macb_ethtool_ops; 357 356 platform_set_drvdata(pdev, dev);
-1
drivers/net/ethernet/calxeda/xgmac.c
··· 1735 1735 SET_NETDEV_DEV(ndev, &pdev->dev); 1736 1736 priv = netdev_priv(ndev); 1737 1737 platform_set_drvdata(pdev, ndev); 1738 - ether_setup(ndev); 1739 1738 ndev->netdev_ops = &xgmac_netdev_ops; 1740 1739 ndev->ethtool_ops = &xgmac_ethtool_ops; 1741 1740 spin_lock_init(&priv->stats_lock);
-3
drivers/net/ethernet/davicom/dm9000.c
··· 1613 1613 1614 1614 /* from this point we assume that we have found a DM9000 */ 1615 1615 1616 - /* driver system function */ 1617 - ether_setup(ndev); 1618 - 1619 1616 ndev->netdev_ops = &dm9000_netdev_ops; 1620 1617 ndev->watchdog_timeo = msecs_to_jiffies(watchdog); 1621 1618 ndev->ethtool_ops = &dm9000_ethtool_ops;
-2
drivers/net/ethernet/ethoc.c
··· 1222 1222 goto error; 1223 1223 } 1224 1224 1225 - ether_setup(netdev); 1226 - 1227 1225 /* setup the net_device structure */ 1228 1226 netdev->netdev_ops = &ethoc_netdev_ops; 1229 1227 netdev->watchdog_timeo = ETHOC_TIMEOUT;
-1
drivers/net/ethernet/lantiq_etop.c
··· 633 633 int err; 634 634 bool random_mac = false; 635 635 636 - ether_setup(dev); 637 636 dev->watchdog_timeo = 10 * HZ; 638 637 err = ltq_etop_hw_init(dev); 639 638 if (err)
-1
drivers/net/ethernet/moxa/moxart_ether.c
··· 511 511 goto init_fail; 512 512 } 513 513 514 - ether_setup(ndev); 515 514 ndev->netdev_ops = &moxart_netdev_ops; 516 515 netif_napi_add(ndev, &priv->napi, moxart_rx_poll, RX_DESC_NUM); 517 516 ndev->priv_flags |= IFF_UNICAST_FLT;
-2
drivers/net/ethernet/netx-eth.c
··· 315 315 unsigned int mac4321, mac65; 316 316 int running, i; 317 317 318 - ether_setup(ndev); 319 - 320 318 ndev->netdev_ops = &netx_eth_netdev_ops; 321 319 ndev->watchdog_timeo = msecs_to_jiffies(5000); 322 320
-1
drivers/net/ethernet/nuvoton/w90p910_ether.c
··· 943 943 { 944 944 struct w90p910_ether *ether = netdev_priv(dev); 945 945 946 - ether_setup(dev); 947 946 dev->netdev_ops = &w90p910_ether_netdev_ops; 948 947 dev->ethtool_ops = &w90p910_ether_ethtool_ops; 949 948
-3
drivers/net/ethernet/nxp/lpc_eth.c
··· 1377 1377 goto err_out_iounmap; 1378 1378 } 1379 1379 1380 - /* Fill in the fields of the device structure with ethernet values. */ 1381 - ether_setup(ndev); 1382 - 1383 1380 /* Setup driver functions */ 1384 1381 ndev->netdev_ops = &lpc_netdev_ops; 1385 1382 ndev->ethtool_ops = &lpc_eth_ethtool_ops;
-2
drivers/net/ethernet/qualcomm/qca_spi.c
··· 810 810 { 811 811 struct qcaspi *qca = NULL; 812 812 813 - ether_setup(dev); 814 - 815 813 dev->netdev_ops = &qcaspi_netdev_ops; 816 814 qcaspi_set_ethtool_ops(dev); 817 815 dev->watchdog_timeo = QCASPI_TX_TIMEOUT;
-3
drivers/net/ethernet/smsc/smc911x.c
··· 1927 1927 } 1928 1928 dev->irq = irq_canonicalize(dev->irq); 1929 1929 1930 - /* Fill in the fields of the device structure with ethernet values. */ 1931 - ether_setup(dev); 1932 - 1933 1930 dev->netdev_ops = &smc911x_netdev_ops; 1934 1931 dev->watchdog_timeo = msecs_to_jiffies(watchdog); 1935 1932 dev->ethtool_ops = &smc911x_ethtool_ops;
-3
drivers/net/ethernet/smsc/smc91x.c
··· 1967 1967 } 1968 1968 dev->irq = irq_canonicalize(dev->irq); 1969 1969 1970 - /* Fill in the fields of the device structure with ethernet values. */ 1971 - ether_setup(dev); 1972 - 1973 1970 dev->watchdog_timeo = msecs_to_jiffies(watchdog); 1974 1971 dev->netdev_ops = &smc_netdev_ops; 1975 1972 dev->ethtool_ops = &smc_ethtool_ops;
-1
drivers/net/ethernet/smsc/smsc911x.c
··· 2255 2255 if (smsc911x_soft_reset(pdata)) 2256 2256 return -ENODEV; 2257 2257 2258 - ether_setup(dev); 2259 2258 dev->flags |= IFF_MULTICAST; 2260 2259 netif_napi_add(dev, &pdata->napi, smsc911x_poll, SMSC_NAPI_WEIGHT); 2261 2260 dev->netdev_ops = &smsc911x_netdev_ops;
-2
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
··· 2765 2765 priv->device = device; 2766 2766 priv->dev = ndev; 2767 2767 2768 - ether_setup(ndev); 2769 - 2770 2768 stmmac_set_ethtool_ops(ndev); 2771 2769 priv->pause = pause; 2772 2770 priv->plat = plat_dat;
-1
drivers/net/ethernet/wiznet/w5100.c
··· 708 708 priv = netdev_priv(ndev); 709 709 priv->ndev = ndev; 710 710 711 - ether_setup(ndev); 712 711 ndev->netdev_ops = &w5100_netdev_ops; 713 712 ndev->ethtool_ops = &w5100_ethtool_ops; 714 713 ndev->watchdog_timeo = HZ;
-1
drivers/net/ethernet/wiznet/w5300.c
··· 620 620 priv = netdev_priv(ndev); 621 621 priv->ndev = ndev; 622 622 623 - ether_setup(ndev); 624 623 ndev->netdev_ops = &w5300_netdev_ops; 625 624 ndev->ethtool_ops = &w5300_ethtool_ops; 626 625 ndev->watchdog_timeo = HZ;