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

• Lines: 71
• Date: Mon Jun 19 13:30:57 2000
• Orig file: v2.4.0-test1/linux/drivers/net/ariadne2.c
• Orig date: Fri Jan 28 15:09:07 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/net/ariadne2.c linux/drivers/net/ariadne2.c
@@ -113,9 +113,6 @@
     };
     unsigned long ioaddr = board+ARIADNE2_BASE*2;
 
-    if (load_8390_module("ariadne2.c"))
-	return -ENOSYS;
-
     /* 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");
@@ -273,8 +270,8 @@
     /* This *shouldn't* happen. If it does, it's the last thing you'll see */
     if (ei_status.dmaing) {
 	printk("%s: DMAing conflict in ne_get_8390_hdr "
-	   "[DMAstat:%d][irqlock:%d][intr:%ld].\n", dev->name, ei_status.dmaing,
-	   ei_status.irqlock, dev->interrupt);
+	   "[DMAstat:%d][irqlock:%d].\n", dev->name, ei_status.dmaing,
+	   ei_status.irqlock);
 	return;
     }
 
@@ -314,9 +311,8 @@
     /* This *shouldn't* happen. If it does, it's the last thing you'll see */
     if (ei_status.dmaing) {
 	printk("%s: DMAing conflict in ne_block_input "
-	   "[DMAstat:%d][irqlock:%d][intr:%ld].\n",
-	   dev->name, ei_status.dmaing, ei_status.irqlock,
-	   dev->interrupt);
+	   "[DMAstat:%d][irqlock:%d].\n",
+	   dev->name, ei_status.dmaing, ei_status.irqlock);
 	return;
     }
     ei_status.dmaing |= 0x01;
@@ -355,8 +351,8 @@
     /* This *shouldn't* happen. If it does, it's the last thing you'll see */
     if (ei_status.dmaing) {
 	printk("%s: DMAing conflict in ne_block_output."
-	   "[DMAstat:%d][irqlock:%d][intr:%ld]\n", dev->name, ei_status.dmaing,
-	   ei_status.irqlock, dev->interrupt);
+	   "[DMAstat:%d][irqlock:%d]\n", dev->name, ei_status.dmaing,
+	   ei_status.irqlock);
 	return;
     }
     ei_status.dmaing |= 0x01;
@@ -405,12 +401,16 @@
 int init_module(void)
 {
     int err;
+
+    if (load_8390_module("ariadne2.c"))
+	return -ENOSYS;
+
     if ((err = register_netdev(&ariadne2_dev))) {
 	if (err == -EIO)
 	    printk("No AriadNE2 ethernet card found.\n");
+	unload_8390_module();
 	return err;
     }
-    lock_8390_module();
     return 0;
 }
 
@@ -419,7 +419,7 @@
     free_irq(IRQ_AMIGA_PORTS, &ariadne2_dev);
     release_mem_region(ZTWO_PADDR(ariadne2_dev.base_addr), NE_IO_EXTENT*2);
     unregister_netdev(&ariadne2_dev);
-    unlock_8390_module();
+    unload_8390_module();
 }
 
 #endif	/* MODULE */