patch-2.3.99-pre7 linux/drivers/net/atp.c

• Lines: 42
• Date: Thu May 4 11:33:58 2000
• Orig file: v2.3.99-pre6/linux/drivers/net/atp.c
• Orig date: Sun Feb 13 19:29:04 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/atp.c linux/drivers/net/atp.c
@@ -130,8 +130,6 @@
 
 /* Index to functions, as function prototypes. */
 
-extern int atp_probe(struct net_device *dev);
-
 static int atp_probe1(struct net_device *dev, short ioaddr);
 static void get_node_ID(struct net_device *dev);
 static unsigned short eeprom_op(short ioaddr, unsigned int cmd);
@@ -571,9 +569,7 @@
 		for (i = 0; i < 6; i++)
 			write_reg_byte(ioaddr, PAR0 + i, dev->dev_addr[i]);
 #ifdef TIMED_CHECKER
-		del_timer(&atp_timer);
-		atp_timer.expires = jiffies + TIMED_CHECKER;
-		add_timer(&atp_timer);
+		mod_timer(&atp_timer, jiffies+TIMED_CHECKER);
 #endif
 	}
 
@@ -605,9 +601,7 @@
 	for (i = 0; i < 6; i++)
 		write_reg_byte(ioaddr, PAR0 + i, atp_timed_dev->dev_addr[i]);
 	spin_unlock(&lp->lock);
-	del_timer(&atp_timer);
-	atp_timer.expires = jiffies + TIMED_CHECKER;
-	add_timer(&atp_timer);
+	mod_timer(&atp_timer, jiffies+TIMED_CHECKER);
 }
 #endif
 
@@ -754,9 +748,8 @@
 #ifdef MODULE
 
 static int io = 0;
-static char nullname[8] = "";
 static struct net_device atp_dev = {
-	nullname, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, atp_probe };
+	"", 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, atp_init };
 	
 MODULE_PARM(io, "I/O port of the pocket adapter");