patch-2.2.18 linux/drivers/scsi/aha152x.c

• Lines: 27
• Date: Sat Oct 28 11:38:40 2000
• Orig file: v2.2.17/drivers/scsi/aha152x.c
• Orig date: Sun Jun 11 21:44:15 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/scsi/aha152x.c linux/drivers/scsi/aha152x.c
@@ -406,8 +406,6 @@
 
 /* END OF DEFINES */
 
-extern long loops_per_sec;
-
 #define DELAY_DEFAULT 100
 
 /* some additional "phases" for getphase() */
@@ -615,7 +613,7 @@
 
 static void do_pause(unsigned amount)
 {				/* Pause for amount*10 milliseconds */
-	unsigned long the_time = jiffies + amount;	/* 0.01 seconds per jiffy */
+	unsigned long the_time = jiffies + (amount*HZ)/100;	/* 0.01 seconds per jiffy */
 
 	while (time_before(jiffies, the_time))
 		barrier();
@@ -1070,7 +1068,7 @@
 		printk("aha152x: trying software interrupt, ");
 		SETBITS(DMACNTRL0, SWINT);
 
-		the_time = jiffies + 100;
+		the_time = jiffies + HZ;
 		while (!HOSTDATA(shpnt)->swint && time_before(jiffies, the_time))
 			barrier();