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

Next file: linux/drivers/net/depca.c
Previous file: linux/drivers/net/de600.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.59/linux/drivers/net/de620.c linux/drivers/net/de620.c
@@ -439,11 +439,10 @@
 static int
 de620_open(struct device *dev)
 {
-	if (request_irq(dev->irq, de620_interrupt, 0, "de620", NULL)) {
+	if (request_irq(dev->irq, de620_interrupt, 0, "de620", dev)) {
 		printk ("%s: unable to get IRQ %d\n", dev->name, dev->irq);
 		return 1;
 	}
-	irq2dev_map[dev->irq] = dev;
 
 	MOD_INC_USE_COUNT;
 	if (adapter_init(dev)) {
@@ -465,7 +464,6 @@
 	de620_set_register(dev, W_TCR, RXOFF);
 
 	free_irq(dev->irq, NULL);
-	irq2dev_map[dev->irq] = NULL;
 
 	dev->start = 0;
 	MOD_DEC_USE_COUNT;
@@ -595,7 +593,7 @@
 static void
 de620_interrupt(int irq_in, void *dev_id, struct pt_regs *regs)
 {
-	struct device *dev = irq2dev_map[irq_in];
+	struct device *dev = dev_id;
 	byte irq_status;
 	int bogus_count = 0;
 	int again = 0;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov