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

• Lines: 50
• Date: Mon Oct 30 12:24:21 2000
• Orig file: v2.4.0-test9/linux/drivers/net/at1700.c
• Orig date: Sat Aug 5 22:49:32 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/at1700.c linux/drivers/net/at1700.c
@@ -191,13 +191,6 @@
    (detachable devices only).
    */
 
-#ifdef HAVE_DEVLIST
-/* Support for a alternate probe manager, which will eliminate the
-   boilerplate below. */
-struct netdev_entry at1700_drv =
-{"at1700", at1700_probe1, AT1700_IO_EXTENT, at1700_probe_list};
-#else
-
 int at1700_probe(struct net_device *dev)
 {
 	int i;
@@ -217,7 +210,6 @@
 	}
 	return -ENODEV;
 }
-#endif
 
 /* The Fujitsu datasheet suggests that the NIC be probed for by checking its
    "signature", the default bit pattern after a reset.  This *doesn't* work --
@@ -324,10 +316,6 @@
 		/* Reset the internal state machines. */
 	outb(0, ioaddr + RESET);
 
-	/* Allocate a new 'dev' if needed. */
-	if (dev == NULL)
-		dev = init_etherdev(0, sizeof(struct net_local));
-
 	if (is_at1700)
 		irq = at1700_irqmap[(read_eeprom(ioaddr, 12)&0x04)
 						   | (read_eeprom(ioaddr, 0)>>14)];
@@ -878,14 +866,10 @@
 }
 
 #ifdef MODULE
-static struct net_device dev_at1700 = {
-	"", /* device name is inserted by linux/drivers/net/net_init.c */
-	0, 0, 0, 0,
-	0, 0,
-	0, 0, 0, NULL, at1700_probe };
+static struct net_device dev_at1700 = { init: at1700_probe };
 
 static int io = 0x260;
-static int irq = 0;
+static int irq;
 
 MODULE_PARM(io, "i");
 MODULE_PARM(irq, "i");