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

• Lines: 73
• Date: Thu Nov 16 12:51:28 2000
• Orig file: v2.4.0-test10/linux/drivers/net/ariadne2.c
• Orig date: Tue Oct 31 12:42:26 2000

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/net/ariadne2.c linux/drivers/net/ariadne2.c
@@ -86,10 +86,12 @@
     unsigned long board, ioaddr;
     int err;
 
+    SET_MODULE_OWNER(dev);
+
     while ((z = zorro_find_device(ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2, z))) {
 	board = z->resource.start;
 	ioaddr = board+ARIADNE2_BASE*2;
-	if (!request_mem_region(ioaddr, NE_IO_EXTENT*2, "RTL8019AS"))
+	if (!request_mem_region(ioaddr, NE_IO_EXTENT*2, dev->name))
 	    continue;
 	if ((err = ariadne2_init(dev, ZTWO_VADDR(board)))) {
 	    release_mem_region(ioaddr, NE_IO_EXTENT*2);
@@ -170,9 +172,8 @@
     dev->irq = IRQ_AMIGA_PORTS;
 
     /* Install the Interrupt handler */
-    if (request_irq(IRQ_AMIGA_PORTS, ei_interrupt, SA_SHIRQ,
-		    "AriadNE2 Ethernet", dev))
-	return -EAGAIN;
+    i = request_irq(IRQ_AMIGA_PORTS, ei_interrupt, SA_SHIRQ, dev->name, dev);
+    if (i) return i;
 
     /* Allocate dev->priv and fill in 8390 specific dev fields. */
     if (ethdev_init(dev)) {
@@ -213,7 +214,6 @@
 static int ariadne2_open(struct net_device *dev)
 {
     ei_open(dev);
-    MOD_INC_USE_COUNT;
     return 0;
 }
 
@@ -222,7 +222,6 @@
     if (ei_debug > 1)
 	printk("%s: Shutting down ethercard.\n", dev->name);
     ei_close(dev);
-    MOD_DEC_USE_COUNT;
     return 0;
 }
 
@@ -381,19 +380,15 @@
 }
 
 #ifdef MODULE
-static struct net_device ariadne2_dev = { init: ariadne2_probe };
+static struct net_device ariadne2_dev;
 
 int init_module(void)
 {
     int err;
 
-    if (load_8390_module("ariadne2.c"))
-	return -ENOSYS;
-
+    ariadne2_dev.init = ariadne2_probe;
     if ((err = register_netdev(&ariadne2_dev))) {
-	if (err == -EIO)
-	    printk("No AriadNE2 ethernet card found.\n");
-	unload_8390_module();
+	printk(KERN_WARNING "No AriadNE2 ethernet card found.\n");
 	return err;
     }
     return 0;
@@ -404,7 +399,6 @@
     free_irq(IRQ_AMIGA_PORTS, &ariadne2_dev);
     release_mem_region(ZTWO_PADDR(ariadne2_dev.base_addr), NE_IO_EXTENT*2);
     unregister_netdev(&ariadne2_dev);
-    unload_8390_module();
 }
 
 #endif	/* MODULE */