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

• Lines: 55
• Date: Mon Oct 30 12:24:22 2000
• Orig file: v2.4.0-test9/linux/drivers/net/seeq8005.c
• Orig date: Mon Jun 19 13:42:38 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/seeq8005.c linux/drivers/net/seeq8005.c
@@ -104,12 +104,7 @@
    If dev->base_addr == 2, allocate space for the device and return success
    (detachable devices only).
    */
-#ifdef HAVE_DEVLIST
-/* Support for an alternate probe manager, which will eliminate the
-   boilerplate below. */
-struct netdev_entry seeq8005_drv =
-{"seeq8005", seeq8005_probe1, SEEQ8005_IO_EXTENT, seeq8005_portlist};
-#else
+
 int __init 
 seeq8005_probe(struct net_device *dev)
 {
@@ -131,7 +126,6 @@
 
 	return -ENODEV;
 }
-#endif
 
 /* This is the real probe routine.  Linux has a history of friendly device
    probes on the ISA bus.  A good device probes avoids doing writes, and
@@ -270,10 +264,6 @@
 	}
 #endif
 
-	/* Allocate a new 'dev' if needed. */
-	if (dev == NULL)
-		dev = init_etherdev(0, sizeof(struct net_local));
-
 	if (net_debug  &&  version_printed++ == 0)
 		printk(version);
 
@@ -712,18 +702,9 @@
 	
 #ifdef MODULE
 
-static char devicename[9] = { 0, };
-
-static struct net_device dev_seeq =
-{
-	devicename, /* device name is inserted by linux/drivers/net/net_init.c */
-	0, 0, 0, 0,
-	0x300, 5,
-	0, 0, 0, NULL, seeq8005_probe
-};
-
-static int io=0x320;
-static int irq=10;
+static struct net_device dev_seeq = { init: seeq8005_probe };
+static int io = 0x320;
+static int irq = 10;
 MODULE_PARM(io, "i");
 MODULE_PARM(irq, "i");