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

• Lines: 45
• Date: Fri Mar 1 07:50:52 1996
• Orig file: v1.3.69/linux/drivers/scsi/eata.c
• Orig date: Mon Oct 23 18:02:10 1995

diff -u --recursive --new-file v1.3.69/linux/drivers/scsi/eata.c linux/drivers/scsi/eata.c
@@ -322,7 +322,7 @@
 #define HD(board) ((struct hostdata *) &sh[board]->hostdata)
 #define BN(board) (HD(board)->board_name)
 
-static void eata2x_interrupt_handler(int, struct pt_regs *);
+static void eata2x_interrupt_handler(int, void *, struct pt_regs *);
 static int do_trace = FALSE;
 
 static inline unchar wait_on_busy(ushort iobase) {
@@ -448,7 +448,7 @@
 
    /* Board detected, allocate its IRQ if not already done */
    if ((irq >= MAX_IRQ) || ((irqlist[irq] == NO_IRQ) && request_irq
-       (irq, eata2x_interrupt_handler, SA_INTERRUPT, driver_name))) {
+       (irq, eata2x_interrupt_handler, SA_INTERRUPT, driver_name, NULL))) {
       printk("%s: unable to allocate IRQ %u, detaching.\n", name, irq);
       return FALSE;
       }
@@ -456,7 +456,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;
       }
 
@@ -481,7 +481,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);
 
@@ -884,7 +884,7 @@
       }
 }
 
-static void eata2x_interrupt_handler(int irq, struct pt_regs * regs) {
+static void eata2x_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 mssp *spp;