patch-2.4.0-test10 linux/drivers/net/ariadne2.c

• Lines: 38
• Date: Mon Oct 30 12:24:21 2000
• Orig file: v2.4.0-test9/linux/drivers/net/ariadne2.c
• Orig date: Mon Jun 19 13:30:57 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/ariadne2.c linux/drivers/net/ariadne2.c
@@ -95,7 +95,6 @@
 	    release_mem_region(ioaddr, NE_IO_EXTENT*2);
 	    return err;
 	}
-	strcpy(z->name, "AriadNE2 Ethernet");
 	return 0;
     }
     return -ENODEV;
@@ -113,12 +112,6 @@
     };
     unsigned long ioaddr = board+ARIADNE2_BASE*2;
 
-    /* We should have a "dev" from Space.c or the static module table. */
-    if (dev == NULL) {
-	printk(KERN_ERR "ariadne2.c: Passed a NULL device.\n");
-	dev = init_etherdev(0, 0);
-    }
-
     /* Reset card. Who knows what dain-bramaged state it was left in. */
     {
 	unsigned long reset_start_time = jiffies;
@@ -388,15 +381,7 @@
 }
 
 #ifdef MODULE
-static char devicename[9] = { 0, };
-
-static struct net_device ariadne2_dev =
-{
-    devicename,
-    0, 0, 0, 0,
-    0, 0,
-    0, 0, 0, NULL, ariadne2_probe,
-};
+static struct net_device ariadne2_dev = { init: ariadne2_probe };
 
 int init_module(void)
 {