Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a05880a authored by Tobias Klauser's avatar Tobias Klauser Committed by David S. Miller
Browse files

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 c706471b ("net: axienet: remove unnecessary
ether_setup after alloc_etherdev") and 3c87dcbf ("net: ll_temac:
Remove unnecessary ether_setup after alloc_etherdev") and fix the
pattern in all remaining ethernet drivers.

Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c2bf5ec2

drivers/net/ethernet/adi/bfin_mac.c

+0 −3
Original line number Diff line number Diff line
@@ -1692,9 +1692,6 @@ static int bfin_mac_probe(struct platform_device *pdev) 
	lp->vlan1_mask = ETH_P_8021Q | mii_bus_data->vlan1_mask;

	lp->vlan2_mask = ETH_P_8021Q | mii_bus_data->vlan2_mask;



	/* Fill in the fields of the device structure with ethernet values. */

	ether_setup(ndev);



	ndev->netdev_ops = &bfin_mac_netdev_ops;

	ndev->ethtool_ops = &bfin_mac_ethtool_ops;

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

+0 −2
Original line number Diff line number Diff line
@@ -878,8 +878,6 @@ static int emac_probe(struct platform_device *pdev) 
	emac_powerup(ndev);

	emac_reset(db);



	ether_setup(ndev);



	ndev->netdev_ops = &emac_netdev_ops;

	ndev->watchdog_timeo = msecs_to_jiffies(watchdog);

	ndev->ethtool_ops = &emac_ethtool_ops;

drivers/net/ethernet/altera/altera_tse_main.c

+0 −1
Original line number Diff line number Diff line
@@ -1433,7 +1433,6 @@ static int altera_tse_probe(struct platform_device *pdev) 
		goto err_free_netdev;



	/* initialize netdev */

	ether_setup(ndev);

	ndev->mem_start = control_port->start;

	ndev->mem_end = control_port->end;

	ndev->netdev_ops = &altera_tse_netdev_ops;

drivers/net/ethernet/cadence/at91_ether.c

+0 −1
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ static int __init at91ether_probe(struct platform_device *pdev) 
	if (res)

		goto err_disable_clock;



	ether_setup(dev);

	dev->netdev_ops = &at91ether_netdev_ops;

	dev->ethtool_ops = &macb_ethtool_ops;

	platform_set_drvdata(pdev, dev);

drivers/net/ethernet/calxeda/xgmac.c

+0 −1
Original line number Diff line number Diff line
@@ -1735,7 +1735,6 @@ static int xgmac_probe(struct platform_device *pdev) 
	SET_NETDEV_DEV(ndev, &pdev->dev);

	priv = netdev_priv(ndev);

	platform_set_drvdata(pdev, ndev);

	ether_setup(ndev);

	ndev->netdev_ops = &xgmac_netdev_ops;

	ndev->ethtool_ops = &xgmac_ethtool_ops;

	spin_lock_init(&priv->stats_lock);