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

• Lines: 45
• Date: Fri Mar 1 07:50:50 1996
• Orig file: v1.3.69/linux/drivers/scsi/AM53C974.c
• Orig date: Fri Jan 26 01:37:06 1996

diff -u --recursive --new-file v1.3.69/linux/drivers/scsi/AM53C974.c linux/drivers/scsi/AM53C974.c
@@ -131,7 +131,7 @@
 static __inline__ void initialize_SCp(Scsi_Cmnd *cmd);
 static __inline__ void run_main(void);
 static void AM53C974_main (void);
-static void AM53C974_intr(int irq, struct pt_regs *regs);
+static void AM53C974_intr(int irq, void *dev_id, struct pt_regs *regs);
 static void AM53C974_intr_disconnect(struct Scsi_Host *instance); 
 static int AM53C974_sync_neg(struct Scsi_Host *instance, int target, unsigned char *msg);
 static __inline__ void AM53C974_set_async(struct Scsi_Host *instance, int target);
@@ -656,7 +656,7 @@
                  (search->irq != instance->irq) || (search == instance) );
      search = search->next);
 if (!search) {
-   if (request_irq(instance->irq, AM53C974_intr, SA_INTERRUPT, "AM53C974")) {
+   if (request_irq(instance->irq, AM53C974_intr, SA_INTERRUPT, "AM53C974", NULL)) {
       printk("scsi%d: IRQ%d not free, detaching\n", instance->host_no, instance->irq);
       scsi_unregister(instance);
       return -1; } 
@@ -916,16 +916,16 @@
 main_running = 0;
 }
 
-/*********************************************************************
-* Function : AM53C974_intr(int irq, struct pt_regs *regs)            *
-*                                                                    *
-* Purpose : interrupt handler                                        *
-*                                                                    *
-* Inputs : irq - interrupt line, regs - ?                            *
-*                                                                    *
-* Returns : nothing                                                  *
-**********************************************************************/
-static void AM53C974_intr(int irq, struct pt_regs *regs)
+/************************************************************************
+* Function : AM53C974_intr(int irq, void *dev_id, struct pt_regs *regs) *
+*                                                                       *
+* Purpose : interrupt handler                                           *
+*                                                                       *
+* Inputs : irq - interrupt line, regs - ?                               *
+*                                                                       *
+* Returns : nothing                                                     *
+************************************************************************/
+static void AM53C974_intr(int irq, void *dev_id, struct pt_regs *regs)
 {
 AM53C974_local_declare(); 
 struct Scsi_Host         *instance;