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

• Lines: 38
• Date: Wed Oct 22 08:27:31 1997
• Orig file: v2.1.59/linux/drivers/net/apricot.c
• Orig date: Thu May 29 21:53:07 1997

diff -u --recursive --new-file v2.1.59/linux/drivers/net/apricot.c linux/drivers/net/apricot.c
@@ -537,11 +537,9 @@
     if (i596_debug > 1)
 	printk("%s: i596_open() irq %d.\n", dev->name, dev->irq);
 
-    if (request_irq(dev->irq, &i596_interrupt, 0, "apricot", NULL))
+    if (request_irq(dev->irq, &i596_interrupt, 0, "apricot", dev))
 	return -EAGAIN;
 
-    irq2dev_map[dev->irq] = dev;
-
     i = init_rx_bufs(dev, RX_RING_SIZE);
 
     if ((i = init_rx_bufs(dev, RX_RING_SIZE)) < RX_RING_SIZE)
@@ -550,7 +548,6 @@
     if (i < 4)
     {
         free_irq(dev->irq, NULL);
-        irq2dev_map[dev->irq] = 0;
         return -EAGAIN;
     }
 
@@ -746,7 +743,7 @@
 static void
 i596_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-    struct device *dev = (struct device *)(irq2dev_map[irq]);
+    struct device *dev = dev_id;
     struct i596_private *lp;
     short ioaddr;
     int boguscnt = 200;
@@ -934,7 +931,6 @@
 	    break;
     	}
     free_irq(dev->irq, NULL);
-    irq2dev_map[dev->irq] = 0;
     remove_rx_bufs(dev);
     MOD_DEC_USE_COUNT;