patch-2.1.60 linux/drivers/net/ac3200.c

• Lines: 37
• Date: Wed Oct 22 08:27:31 1997
• Orig file: v2.1.59/linux/drivers/net/ac3200.c
• Orig date: Wed Apr 23 19:01:18 1997

diff -u --recursive --new-file v2.1.59/linux/drivers/net/ac3200.c linux/drivers/net/ac3200.c
@@ -165,7 +165,7 @@
 	else if (dev->irq == 2)
 		dev->irq = 9;
 
-	if (request_irq(dev->irq, ei_interrupt, 0, "ac3200", NULL)) {
+	if (request_irq(dev->irq, ei_interrupt, 0, "ac3200", dev)) {
 		printk (" unable to get IRQ %d.\n", dev->irq);
 		return EAGAIN;
 	}
@@ -228,7 +228,7 @@
 	/* Someday we may enable the IRQ and shared memory here. */
 	int ioaddr = dev->base_addr;
 
-	if (request_irq(dev->irq, ei_interrupt, 0, "ac3200", NULL))
+	if (request_irq(dev->irq, ei_interrupt, 0, "ac3200", dev))
 		return -EAGAIN;
 #endif
 
@@ -304,7 +304,6 @@
 	/* We should someday disable shared memory and interrupts. */
 	outb(0x00, ioaddr + 6);	/* Disable interrupts. */
 	free_irq(dev->irq, NULL);
-	irq2dev_map[dev->irq] = 0;
 #endif
 
 	ei_close(dev);
@@ -369,9 +368,8 @@
 		if (dev->priv != NULL) {
 			kfree(dev->priv);
 			dev->priv = NULL;
-			/* Someday free_irq + irq2dev may be in ac_close_card() */
+			/* Someday free_irq may be in ac_close_card() */
 			free_irq(dev->irq, NULL);
-			irq2dev_map[dev->irq] = NULL;
 			release_region(dev->base_addr, AC_IO_EXTENT);
 			unregister_netdev(dev);
 		}