patch-1.3.70 linux/drivers/scsi/eata_dma.c

• Lines: 74
• Date: Fri Mar 1 07:50:52 1996
• Orig file: v1.3.69/linux/drivers/scsi/eata_dma.c
• Orig date: Mon Dec 11 15:42:03 1995

diff -u --recursive --new-file v1.3.69/linux/drivers/scsi/eata_dma.c linux/drivers/scsi/eata_dma.c
@@ -114,7 +114,7 @@
     return;
 }   
 
-void eata_fake_int_handler(s32 irq, struct pt_regs * regs)
+void eata_fake_int_handler(s32 irq, void *dev_id, struct pt_regs * regs)
 {
     fake_int_result = inb((ulong)fake_int_base + HA_RSTATUS);
     fake_int_happened = TRUE;
@@ -129,7 +129,7 @@
 int eata_release(struct Scsi_Host *sh)
 {
     uint i;
-    if (sh->irq && reg_IRQ[sh->irq] == 1) free_irq(sh->irq);
+    if (sh->irq && reg_IRQ[sh->irq] == 1) free_irq(sh->irq, NULL);
     else reg_IRQ[sh->irq]--;
     
     scsi_init_free((void *)status, 512);
@@ -150,7 +150,7 @@
 #endif
 
 
-void eata_int_handler(int irq, struct pt_regs * regs)
+void eata_int_handler(int irq, void *dev_id, struct pt_regs * regs)
 {
     uint i, result = 0;
     uint hba_stat, scsi_stat, eata_stat;
@@ -867,7 +867,7 @@
     
     if (reg_IRQ[gc->IRQ] == FALSE) {	/* Interrupt already registered ? */
 	if (!request_irq(gc->IRQ, (void *) eata_fake_int_handler, SA_INTERRUPT,
-			 "eata_dma")){
+			 "eata_dma", NULL)){
 	    reg_IRQ[gc->IRQ]++;
 	    if (!gc->IRQ_TR)
 		reg_IRQL[gc->IRQ] = TRUE;   /* IRQ is edge triggered */
@@ -892,7 +892,7 @@
 		   dma_channel, base);
 	    reg_IRQ[gc->IRQ]--;
 	    if (reg_IRQ[gc->IRQ] == 0)
-		free_irq(gc->IRQ);
+		free_irq(gc->IRQ, NULL);
 	    if (gc->IRQ_TR == FALSE)
 		reg_IRQL[gc->IRQ] = FALSE; 
 	    return (FALSE);
@@ -919,7 +919,7 @@
 		free_dma(dma_channel);
 	    reg_IRQ[gc->IRQ]--;
 	    if (reg_IRQ[gc->IRQ] == 0)
-		free_irq(gc->IRQ);
+		free_irq(gc->IRQ, NULL);
 	    if (gc->IRQ_TR == FALSE)
 		reg_IRQL[gc->IRQ] = FALSE; 
 	    return (FALSE);
@@ -956,7 +956,7 @@
 	
 	reg_IRQ[gc->IRQ]--;
 	if (reg_IRQ[gc->IRQ] == 0)
-	    free_irq(gc->IRQ);
+	    free_irq(gc->IRQ, NULL);
 	if (gc->IRQ_TR == FALSE)
 	    reg_IRQL[gc->IRQ] = FALSE; 
 	return (FALSE);
@@ -1306,8 +1306,8 @@
     
     for (i = 0; i <= MAXIRQ; i++) { /* Now that we know what we have, we     */
 	if (reg_IRQ[i]){            /* exchange the interrupt handler which  */
-	    free_irq(i);            /* we used for probing with the real one */
-	    request_irq(i, (void *)(eata_int_handler), SA_INTERRUPT, "eata_dma");
+	    free_irq(i, NULL);      /* we used for probing with the real one */
+	    request_irq(i, (void *)(eata_int_handler), SA_INTERRUPT, "eata_dma", NULL);
 	}
     }
     HBA_ptr = first_HBA;