aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/netx-eth.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2014-10-02 04:15:30 -0400
committerDavid S. Miller <davem@davemloft.net>2014-10-03 18:31:40 -0400
commit6a05880a8b22c6ba2ffdabbceb4635d28abe9072 (patch)
treeddfe9129a865ed13888fa91603c4326717435beb /drivers/net/ethernet/netx-eth.c
parentc2bf5ec20488fb91af32f1c7f7c63f338ebacc9f (diff)
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>
Diffstat (limited to 'drivers/net/ethernet/netx-eth.c')
-rw-r--r--drivers/net/ethernet/netx-eth.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/netx-eth.c b/drivers/net/ethernet/netx-eth.c
index 31eb911e4763..8176c8a1cc6a 100644
--- a/drivers/net/ethernet/netx-eth.c
+++ b/drivers/net/ethernet/netx-eth.c
@@ -315,8 +315,6 @@ static int netx_eth_enable(struct net_device *ndev)
315 unsigned int mac4321, mac65; 315 unsigned int mac4321, mac65;
316 int running, i; 316 int running, i;
317 317
318 ether_setup(ndev);
319
320 ndev->netdev_ops = &netx_eth_netdev_ops; 318 ndev->netdev_ops = &netx_eth_netdev_ops;
321 ndev->watchdog_timeo = msecs_to_jiffies(5000); 319 ndev->watchdog_timeo = msecs_to_jiffies(5000);
322 320