patch-2.1.104 linux/drivers/scsi/aha1542.c

• Lines: 28
• Date: Fri May 22 23:10:45 1998
• Orig file: v2.1.103/linux/drivers/scsi/aha1542.c
• Orig date: Tue Apr 14 14:29:21 1998

diff -u --recursive --new-file v2.1.103/linux/drivers/scsi/aha1542.c linux/drivers/scsi/aha1542.c
@@ -155,7 +155,7 @@
      WAITbits = inb(port) & (mask);					\
      if ((WAITbits & (allof)) == (allof) && ((WAITbits & (noneof)) == 0)) \
        break;                                                         	\
-     udelay(1000);							\
+     mdelay(1);							\
      if (--WAITtimeout == 0) goto fail;					\
    }									\
  }
@@ -223,7 +223,7 @@
 
 /* Similar to aha1542_in, except that we wait a very short period of time.
    We use this if we know the board is alive and awake, but we are not sure
-   if the board will respond the the command we are about to send or not */
+   if the board will respond to the command we are about to send or not */
 static int aha1542_in1(unsigned int base, unchar *cmdp, int len)
 {
     unsigned long flags;
@@ -319,8 +319,7 @@
 
     outb(SRST|IRST/*|SCRST*/, CONTROL(bse));
 
-    i = jiffies + 2;
-    while (i>jiffies); /* Wait a little bit for things to settle down. */
+    mdelay(20);	/* Wait a little bit for things to settle down. */
     
     debug = 1;
     /* Expect INIT and IDLE, any of the others are bad */