patch-2.4.0-test10 linux/drivers/net/3c527.c

• Lines: 33
• Date: Mon Oct 30 12:24:21 2000
• Orig file: v2.4.0-test9/linux/drivers/net/3c527.c
• Orig date: Sun Oct 8 10:50:18 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/3c527.c linux/drivers/net/3c527.c
@@ -272,19 +272,6 @@
 		return -ENODEV;
 	}
 
-	/*
-	 * Don't allocate the private data here, it is done later
-	 * This makes it easier to free the memory when this driver
-	 * is used as a module.
-	 */
-
-	if(dev==NULL)
-	{
-		dev = init_etherdev(0, 0);
-		if (dev == NULL)
-			return -ENOMEM;
-	}
-
 	/* Fill in the 'dev' fields. */
 	dev->base_addr = mca_io_bases[(POS>>1)&7];
 	dev->mem_start = mca_mem_bases[(POS>>4)&7];
@@ -1457,11 +1444,7 @@
 
 #ifdef MODULE
 
-static struct net_device this_device = {
-	"", /* will be inserted by linux/drivers/net/mc32_init.c */
-	0, 0, 0, 0,
-	0, 0,  /* I/O address, IRQ */
-	0, 0, 0, NULL, mc32_probe };
+static struct net_device this_device = { init: mc32_probe };
 
 
 /**