patch-2.1.60 linux/drivers/net/hp100.c
Next file: linux/drivers/net/ibmtr.c
Previous file: linux/drivers/net/hp.c
Back to the patch index
Back to the overall index
- Lines: 33
- Date:
Wed Oct 22 08:27:32 1997
- Orig file:
v2.1.59/linux/drivers/net/hp100.c
- Orig date:
Sat May 24 09:10:23 1997
diff -u --recursive --new-file v2.1.59/linux/drivers/net/hp100.c linux/drivers/net/hp100.c
@@ -1022,14 +1022,12 @@
}
}
else
- if(request_irq(dev->irq, hp100_interrupt, SA_INTERRUPT, lp->id->name, NULL))
+ if(request_irq(dev->irq, hp100_interrupt, SA_INTERRUPT, lp->id->name, dev))
{
printk( "%s: unable to get IRQ %d\n", dev->name, dev->irq );
return -EAGAIN;
}
- irq2dev_map[ dev->irq ] = dev;
-
MOD_INC_USE_COUNT;
dev->tbusy = 0;
@@ -1077,7 +1075,6 @@
free_irq( dev->irq, dev );
else
free_irq( dev->irq, NULL );
- irq2dev_map[ dev->irq ] = NULL;
MOD_DEC_USE_COUNT;
return 0;
}
@@ -2104,7 +2101,7 @@
static void hp100_interrupt( int irq, void *dev_id, struct pt_regs *regs )
{
- struct device *dev = (struct device *)irq2dev_map[ irq ];
+ struct device *dev = dev_id;
struct hp100_private *lp = (struct hp100_private *)dev->priv;
int ioaddr;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov