patch-1.3.70 linux/drivers/net/3c59x.c

• Lines: 45
• Date: Fri Mar 1 07:50:42 1996
• Orig file: v1.3.69/linux/drivers/net/3c59x.c
• Orig date: Wed Feb 14 14:37:10 1996

diff -u --recursive --new-file v1.3.69/linux/drivers/net/3c59x.c linux/drivers/net/3c59x.c
@@ -237,7 +237,7 @@
 static void vortex_timer(unsigned long arg);
 static int vortex_start_xmit(struct sk_buff *skb, struct device *dev);
 static int vortex_rx(struct device *dev);
-static void vortex_interrupt(int irq, struct pt_regs *regs);
+static void vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 static int vortex_close(struct device *dev);
 static void update_stats(int addr, struct device *dev);
 static struct enet_statistics *vortex_get_stats(struct device *dev);
@@ -550,7 +550,7 @@
 	if (dev->irq == 0  ||  irq2dev_map[dev->irq] != NULL)
 		return -EAGAIN;
 	irq2dev_map[dev->irq] = dev;
-	if (request_irq(dev->irq, &vortex_interrupt, 0, vp->product_name)) {
+	if (request_irq(dev->irq, &vortex_interrupt, 0, vp->product_name, NULL)) {
 		irq2dev_map[dev->irq] = NULL;
 		return -EAGAIN;
 	}
@@ -736,7 +736,7 @@
 
 /* The interrupt handler does all of the Rx thread work and cleans up
    after the Tx thread. */
-static void vortex_interrupt(int irq, struct pt_regs *regs)
+static void vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
 #ifdef USE_SHARED_IRQ
 	struct device *dev = (struct device *)(irq == 0 ? regs : irq2dev_map[irq]);
@@ -774,7 +774,7 @@
 		if (donedidthis++ > 1) {
 			printk("%s: Bogus interrupt, bailing. Status %4.4x, start=%d.\n",
 				   dev->name, status, dev->start);
-			free_irq(dev->irq);
+			free_irq(dev->irq, NULL);
 		}
 	}
 
@@ -955,7 +955,7 @@
 #ifdef USE_SHARED_IRQ
 	free_shared_irq(dev->irq, dev);
 #else
-	free_irq(dev->irq);
+	free_irq(dev->irq, NULL);
 	/* Mmmm, we should diable all interrupt sources here. */
 	irq2dev_map[dev->irq] = 0;
 #endif