patch-2.1.101 linux/drivers/scsi/qlogicpti.c

• Lines: 55
• Date: Fri May 8 00:22:12 1998
• Orig file: v2.1.100/linux/drivers/scsi/qlogicpti.c
• Orig date: Thu Apr 23 20:21:35 1998

diff -u --recursive --new-file v2.1.100/linux/drivers/scsi/qlogicpti.c linux/drivers/scsi/qlogicpti.c
@@ -563,7 +563,6 @@
 	}
 }
 
-static void qlogicpti_intr_handler(int irq, void *dev_id, struct pt_regs *regs);
 static void do_qlogicpti_intr_handler(int irq, void *dev_id, struct pt_regs *regs);
 
 /* Detect all PTI Qlogic ISP's in the machine. */
@@ -1051,18 +1050,10 @@
 	return (sts->scsi_status & STATUS_MASK) | (host_status << 16);
 }
 
-static void do_qlogicpti_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
-{
-	unsigned long flags;
-
-	spin_lock_irqsave(&io_request_lock, flags);
-	qlogicpti_intr_handler(irq, dev_id, regs);
-	spin_unlock_irqrestore(&io_request_lock, flags);
-}
-
 #ifndef __sparc_v9__
 
-static void qlogicpti_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
+static __inline__ void qlogicpti_intr_handler(int irq, void *dev_id,
+					      struct pt_regs *regs)
 {
 	static int running = 0;
 	Scsi_Cmnd *Cmnd;
@@ -1150,7 +1141,8 @@
 
 #else /* __sparc_v9__ */
 
-static void qlogicpti_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
+static __inline__ void qlogicpti_intr_handler(int irq, void *dev_id,
+					      struct pt_regs *regs)
 {
 	struct qlogicpti *qpti = dev_id;
 	Scsi_Cmnd *Cmnd;
@@ -1217,6 +1209,15 @@
 }
 
 #endif
+
+static void do_qlogicpti_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
+{
+	unsigned long flags;
+
+	spin_lock_irqsave(&io_request_lock, flags);
+	qlogicpti_intr_handler(irq, dev_id, regs);
+	spin_unlock_irqrestore(&io_request_lock, flags);
+}
 
 int qlogicpti_abort(Scsi_Cmnd *Cmnd)
 {