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

• Lines: 43
• Date: Thu Jun 4 15:52:21 1998
• Orig file: v2.1.103/linux/drivers/scsi/fdomain.c
• Orig date: Wed May 20 19:10:39 1998

diff -u --recursive --new-file v2.1.103/linux/drivers/scsi/fdomain.c linux/drivers/scsi/fdomain.c
@@ -1,6 +1,6 @@
 /* fdomain.c -- Future Domain TMC-16x0 SCSI driver
  * Created: Sun May  3 18:53:19 1992 by faith@cs.unc.edu
- * Revised: Wed Oct  2 11:10:55 1996 by r.faith@ieee.org
+ * Revised: Wed Oct  2 11:10:55 1996 by faith@acm.org
  * Author: Rickard E. Faith, faith@cs.unc.edu
  * Copyright 1992, 1993, 1994, 1995, 1996 Rickard E. Faith
  *
@@ -956,14 +956,14 @@
 	 if (retcode == -EINVAL) {
 	    printk( "fdomain: IRQ %d is bad!\n", interrupt_level );
 	    printk( "         This shouldn't happen!\n" );
-	    printk( "         Send mail to faith@cs.unc.edu\n" );
+	    printk( "         Send mail to faith@acm.org\n" );
 	 } else if (retcode == -EBUSY) {
 	    printk( "fdomain: IRQ %d is already in use!\n", interrupt_level );
 	    printk( "         Please use another IRQ!\n" );
 	 } else {
 	    printk( "fdomain: Error getting IRQ %d\n", interrupt_level );
 	    printk( "         This shouldn't happen!\n" );
-	    printk( "         Send mail to faith@cs.unc.edu\n" );
+	    printk( "         Send mail to faith@acm.org\n" );
 	 }
 	 panic( "fdomain: Driver requires interruptions\n" );
       }
@@ -1107,7 +1107,7 @@
       status = inb( TMC_Status_port );        /* Read adapter status */
       if (status & 0x02)		      /* Arbitration complete */
 	    return 0;
-      udelay(1000);			/* Wait one millisecond */
+      mdelay(1);			/* Wait one millisecond */
    } while (--timeout);
 
    /* Make bus idle */
@@ -1145,7 +1145,7 @@
 	 outb( 0x80, SCSI_Cntl_port );
 	 return 0;
       }
-      udelay(1000);			/* wait one msec */
+      mdelay(1);			/* wait one msec */
    } while (--timeout);
    /* Make bus idle */
    fdomain_make_bus_idle();