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

• Lines: 36
• Date: Thu May 21 14:24:08 1998
• Orig file: v2.1.103/linux/drivers/scsi/ibmmca.c
• Orig date: Thu May 14 19:47:41 1998

diff -u --recursive --new-file v2.1.103/linux/drivers/scsi/ibmmca.c linux/drivers/scsi/ibmmca.c
@@ -1042,7 +1042,7 @@
   int len = 0;
 
   len += sprintf (buf + len, "Subsystem PUN: %d\n", subsystem_pun);
-  len += sprintf (buf + len, "I/O base address: 0x%x\n", IM_CMD_REG);
+  len += sprintf (buf + len, "I/O base address: 0x%lx\n", IM_CMD_REG);
   return len;
 }
 
@@ -1269,7 +1269,7 @@
 		    issue_cmd (shpnt, IM_RESET_IMM_CMD, IM_IMM_CMD | ldn);
 		    while (reset_status == IM_RESET_IN_PROGRESS && --ticks) 
 		      {
-			udelay(1000000/HZ);
+			mdelay(1+999/HZ);
 			barrier();
 		      }
 		    /* if reset did not complete, just claim */
@@ -2072,7 +2072,7 @@
   reset_status = IM_RESET_IN_PROGRESS;
   issue_cmd (shpnt, IM_RESET_IMM_CMD, IM_IMM_CMD | 0xf);
   while (reset_status == IM_RESET_IN_PROGRESS && --ticks) {
-    udelay(1000000/HZ);
+    mdelay(1+999/HZ);
     barrier();
   }
   /* if reset did not complete, just return an error*/
@@ -2205,7 +2205,7 @@
 #endif
    len += sprintf(buffer+len, "               This Hostnumber..........: %d\n",
 		  hostno);
-   len += sprintf(buffer+len, "               Base I/O-Port............: 0x%x\n",
+   len += sprintf(buffer+len, "               Base I/O-Port............: 0x%lx\n",
 		  IM_CMD_REG);
    len += sprintf(buffer+len, "               (Shared) IRQ.............: %d\n",
 		  IM_IRQ);