--- Gnu-Mach/linux/src/drivers/scsi/aha1542.c	2020/09/02 04:43:54	1.1.1.2
+++ Gnu-Mach/linux/src/drivers/scsi/aha1542.c	2020/09/02 04:46:28	1.1.1.3
@@ -1,4 +1,4 @@
-/* $Id: aha1542.c,v 1.1.1.2 2020/09/02 04:43:54 root Exp $
+/* $Id: aha1542.c,v 1.1.1.3 2020/09/02 04:46:28 root Exp $
  *  linux/kernel/aha1542.c
  *
  *  Copyright (C) 1992  Tommy Thorn
@@ -53,7 +53,7 @@ struct proc_dir_entry proc_scsi_aha1542
 #define DEB(x)
 #endif
 /*
-static const char RCSid[] = "$Header: /var/lib/cvsd/gnumach/Gnu-Mach/linux/src/drivers/scsi/aha1542.c,v 1.1.1.2 2020/09/02 04:43:54 root Exp $";
+static const char RCSid[] = "$Header: /var/lib/cvsd/gnumach/Gnu-Mach/linux/src/drivers/scsi/aha1542.c,v 1.1.1.3 2020/09/02 04:46:28 root Exp $";
 */
 
 /* The adaptec can be configured for quite a number of addresses, but
@@ -120,8 +120,8 @@ static int aha1542_restart(struct Scsi_H
 #define aha1542_intr_reset(base)  outb(IRST, CONTROL(base))
 
 #define WAIT(port, mask, allof, noneof)					\
- { register WAITbits;							\
-   register WAITtimeout = WAITnexttimeout;				\
+ { register int WAITbits;						\
+   register int WAITtimeout = WAITnexttimeout;				\
    while (1) {								\
      WAITbits = inb(port) & (mask);					\
      if ((WAITbits & (allof)) == (allof) && ((WAITbits & (noneof)) == 0)) \
@@ -133,8 +133,8 @@ static int aha1542_restart(struct Scsi_H
 /* Similar to WAIT, except we use the udelay call to regulate the
    amount of time we wait.  */
 #define WAITd(port, mask, allof, noneof, timeout)			\
- { register WAITbits;							\
-   register WAITtimeout = timeout;					\
+ { register int WAITbits;						\
+   register int WAITtimeout = timeout;					\
    while (1) {								\
      WAITbits = inb(port) & (mask);					\
      if ((WAITbits & (allof)) == (allof) && ((WAITbits & (noneof)) == 0)) \
@@ -356,7 +356,7 @@ static void aha1542_intr_handle(int irq,
     void (*my_done)(Scsi_Cmnd *) = NULL;
     int errstatus, mbi, mbo, mbistatus;
     int number_serviced;
-    unsigned int flags;
+    unsigned long flags;
     struct Scsi_Host * shost;
     Scsi_Cmnd * SCtmp;
     int flag;
@@ -875,7 +875,7 @@ void aha1542_setup( char *str, int *ints
     if (ints[0] < 1 || ints[0] > 4)
       {
 	printk("aha1542: %s\n", str );
-	printk(ahausage);
+	printk("%s", ahausage);
 	printk("aha1542: Wrong parameters may cause system malfunction.. We try anyway..\n");
       }
 
@@ -905,7 +905,7 @@ void aha1542_setup( char *str, int *ints
 	    break;
 	default:
 	    printk("aha1542: %s\n", str );
-	    printk(ahausage);
+	    printk("%s", ahausage);
 	    printk("aha1542: Valid values for DMASPEED are 5-8, 10 MB/s.  Using jumper defaults.\n");
 	    break;
       }