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

Next file: linux/drivers/scsi/qlogicpti.c
Previous file: linux/drivers/scsi/ncr53c8xx.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.103/linux/drivers/scsi/ppa.c linux/drivers/scsi/ppa.c
@@ -798,10 +798,10 @@
 	w_ctr(ppb, 0x08);
 	udelay(30);
 	w_ctr(ppb, 0x0c);
-	udelay(1000);		/* Allow devices to settle down */
+	mdelay(1);		/* Allow devices to settle down */
     }
     ppa_disconnect(host_no);
-    udelay(1000);		/* Another delay to allow devices to settle */
+    mdelay(1);		/* Another delay to allow devices to settle */
 
     if (!retv)
 	retv = device_check(host_no);
@@ -1139,7 +1139,7 @@
 }
 
 /*
- * Apparently the the disk->capacity attribute is off by 1 sector 
+ * Apparently the disk->capacity attribute is off by 1 sector 
  * for all disk drives.  We add the one here, but it should really
  * be done in sd.c.  Even if it gets fixed there, this will still
  * work.
@@ -1200,9 +1200,9 @@
     w_ctr(ppb, 0x8);
     udelay(30);
     w_ctr(ppb, 0xc);
-    udelay(1000);		/* delay for devices to settle down */
+    mdelay(1);		/* delay for devices to settle down */
     ppa_disconnect(host_no);
-    udelay(1000);		/* Additional delay to allow devices to settle down */
+    mdelay(1);		/* Additional delay to allow devices to settle down */
 
     /*
      * PHASE2:
@@ -1264,9 +1264,9 @@
 	    w_ctr(ppb, 0x08);
 	    udelay(30);
 	    w_ctr(ppb, 0x0c);
-	    udelay(1000);
+	    mdelay(1);
 	    ppa_disconnect(host_no);
-	    udelay(1000);
+	    mdelay(1);
 	    if (ppa_hosts[host_no].mode == PPA_EPP_32) {
 		ppa_hosts[host_no].mode = old_mode;
 		goto second_pass;
@@ -1291,9 +1291,9 @@
 	    w_ctr(ppb, 0x08);
 	    udelay(30);
 	    w_ctr(ppb, 0x0c);
-	    udelay(1000);
+	    mdelay(1);
 	    ppa_disconnect(host_no);
-	    udelay(1000);
+	    mdelay(1);
 	    if (ppa_hosts[host_no].mode == PPA_EPP_32) {
 		ppa_hosts[host_no].mode = old_mode;
 		goto second_pass;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov