From 085d487130cc41753b647d3961e7ded8a067f29c Mon Sep 17 00:00:00 2001 From: Alexander Viro Date: Sat, 10 Jan 2004 05:34:08 -0500 Subject: [PATCH] [netdrvr] alloc_etherdev-related cleanups Mostly removing unneeded calls to ether_setup(), which alloc_etherdev() already does for us. --- drivers/net/ethertap.c | 3 +-- drivers/net/plip.c | 4 ++-- drivers/usb/gadget/ether.c | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethertap.c b/drivers/net/ethertap.c index 7f4f4ae8c5c62..6f2de5295cf4b 100644 --- a/drivers/net/ethertap.c +++ b/drivers/net/ethertap.c @@ -72,8 +72,7 @@ static int __init ethertap_probe(int unit) struct net_device *dev; int err = -ENOMEM; - dev = alloc_netdev(sizeof(struct net_local), "tap%d", - ether_setup); + dev = alloc_etherdev(sizeof(struct net_local)); if (!dev) goto out; diff --git a/drivers/net/plip.c b/drivers/net/plip.c index 8b8c640847d7b..83236666372cc 100644 --- a/drivers/net/plip.c +++ b/drivers/net/plip.c @@ -1282,13 +1282,13 @@ static void plip_attach (struct parport *port) } sprintf(name, "plip%d", unit); - dev = alloc_netdev(sizeof(struct net_local), name, - ether_setup); + dev = alloc_etherdev(sizeof(struct net_local)); if (!dev) { printk(KERN_ERR "plip: memory squeeze\n"); return; } + strcpy(dev->name, name); dev->init = plip_init_netdev; SET_MODULE_OWNER(dev); diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 131ee14bc5687..ad62e0f39dd7a 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -1782,9 +1782,7 @@ eth_bind (struct usb_gadget *gadget) /* network device setup */ dev->net = net; SET_MODULE_OWNER (net); - net->priv = dev; strcpy (net->name, "usb%d"); - ether_setup (net); /* one random address for the gadget device ... both of these could * reasonably come from an id prom or a module parameter. -- 2.53.0