patch-2.1.60 linux/drivers/net/3c505.c

• Lines: 38
• Date: Wed Oct 22 08:27:31 1997
• Orig file: v2.1.59/linux/drivers/net/3c505.c
• Orig date: Tue May 13 22:41:08 1997

diff -u --recursive --new-file v2.1.59/linux/drivers/net/3c505.c linux/drivers/net/3c505.c
@@ -669,7 +669,7 @@
 		printk("elp_interrupt(): illegal IRQ number found in interrupt routine (%i)\n", irq);
 		return;
 	}
-	dev = irq2dev_map[irq];
+	dev = dev_id;
 
 	if (dev == NULL) {
 		printk("elp_interrupt(): irq %d for unknown device.\n", irq);
@@ -926,15 +926,9 @@
 	adapter->rx_backlog.out = 0;
 
 	/*
-	 * make sure we can find the device header given the interrupt number
-	 */
-	irq2dev_map[dev->irq] = dev;
-
-	/*
 	 * install our interrupt service routine
 	 */
-	if (request_irq(dev->irq, &elp_interrupt, 0, "3c505", NULL)) {
-		irq2dev_map[dev->irq] = NULL;
+	if (request_irq(dev->irq, &elp_interrupt, 0, "3c505", dev)) {
 		return -EAGAIN;
 	}
 	if (request_dma(dev->dma, "3c505")) {
@@ -1223,11 +1217,6 @@
 	 * release the IRQ
 	 */
 	free_irq(dev->irq, NULL);
-
-	/*
-	 * and we no longer have to map irq to dev either
-	 */
-	irq2dev_map[dev->irq] = 0;
 
 	free_dma(dev->dma);
 	free_pages((unsigned long) adapter->dma_buffer, __get_order(DMA_BUFFER_SIZE));