patch-1.3.70 linux/drivers/scsi/u14-34f.c

• Lines: 45
• Date: Fri Mar 1 07:50:54 1996
• Orig file: v1.3.69/linux/drivers/scsi/u14-34f.c
• Orig date: Mon Oct 23 18:02:12 1995

diff -u --recursive --new-file v1.3.69/linux/drivers/scsi/u14-34f.c linux/drivers/scsi/u14-34f.c
@@ -287,7 +287,7 @@
 #define HD(board) ((struct hostdata *) &sh[board]->hostdata)
 #define BN(board) (HD(board)->board_name)
 
-static void u14_34f_interrupt_handler(int, struct pt_regs *);
+static void u14_34f_interrupt_handler(int, void *, struct pt_regs *);
 static int do_trace = FALSE;
 
 static inline unchar wait_on_busy(ushort iobase) {
@@ -407,7 +407,7 @@
 
    /* Board detected, allocate its IRQ if not already done */
    if ((irq >= MAX_IRQ) || ((irqlist[irq] == NO_IRQ) && request_irq
-       (irq, u14_34f_interrupt_handler, SA_INTERRUPT, driver_name))) {
+       (irq, u14_34f_interrupt_handler, SA_INTERRUPT, driver_name, NULL))) {
       printk("%s: unable to allocate IRQ %u, detaching.\n", name, irq);
       return FALSE;
       }
@@ -415,7 +415,7 @@
    if (subversion == ISA && request_dma(dma_channel, driver_name)) {
       printk("%s: unable to allocate DMA channel %u, detaching.\n",
 	     name, dma_channel);
-      free_irq(irq);
+      free_irq(irq, NULL);
       return FALSE;
       }
 
@@ -424,7 +424,7 @@
    if (sh[j] == NULL) {
       printk("%s: unable to register host, detaching.\n", name);
 
-      if (irqlist[irq] == NO_IRQ) free_irq(irq);
+      if (irqlist[irq] == NO_IRQ) free_irq(irq, NULL);
 
       if (subversion == ISA) free_dma(dma_channel);
 
@@ -838,7 +838,7 @@
    return 0;
 }
 
-static void u14_34f_interrupt_handler(int irq, struct pt_regs * regs) {
+static void u14_34f_interrupt_handler(int irq, void *dev_id, struct pt_regs * regs) {
    Scsi_Cmnd *SCpnt;
    unsigned int i, j, k, flags, status, tstatus, loops, total_loops = 0;
    struct mscp *spp;