1 files changed, 64 insertions, 73 deletions

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index bcd223868227..93d13fc9a293 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -27,8 +27,6 @@
  */
 
 /*
- * $Log: NCR5380.c,v $
-
  * Revision 1.10 1998/9/2       Alan Cox
  *                              (alan@lxorguk.ukuu.org.uk)
  * Fixed up the timer lockups reported so far. Things still suck. Looking 
@@ -89,13 +87,6 @@
 #include <scsi/scsi_dbg.h>
 #include <scsi/scsi_transport_spi.h>
 
-#ifndef NDEBUG
-#define NDEBUG 0
-#endif
-#ifndef NDEBUG_ABORT
-#define NDEBUG_ABORT 0
-#endif
-
 #if (NDEBUG & NDEBUG_LISTS)
 #define LIST(x,y) {printk("LINE:%d   Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); if ((x)==(y)) udelay(5); }
 #define REMOVE(w,x,y,z) {printk("LINE:%d   Removing: %p->%p  %p->%p \n", __LINE__, (void*)(w), (void*)(x), (void*)(y), (void*)(z)); if ((x)==(y)) udelay(5); }
@@ -1005,7 +996,7 @@ static int NCR5380_queue_command_lck(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)
                 LIST(cmd, tmp);
                 tmp->host_scribble = (unsigned char *) cmd;
         }
-        dprintk(NDEBUG_QUEUES, ("scsi%d : command added to %s of queue\n", instance->host_no, (cmd->cmnd[0] == REQUEST_SENSE) ? "head" : "tail"));
+        dprintk(NDEBUG_QUEUES, "scsi%d : command added to %s of queue\n", instance->host_no, (cmd->cmnd[0] == REQUEST_SENSE) ? "head" : "tail");
 
         /* Run the coroutine if it isn't already running. */
         /* Kick off command processing */
@@ -1040,7 +1031,7 @@ static void NCR5380_main(struct work_struct *work)
                 /* Lock held here */
                 done = 1;
                 if (!hostdata->connected && !hostdata->selecting) {
-                        dprintk(NDEBUG_MAIN, ("scsi%d : not connected\n", instance->host_no));
+                        dprintk(NDEBUG_MAIN, "scsi%d : not connected\n", instance->host_no);
                         /*
                          * Search through the issue_queue for a command destined
                          * for a target that's not busy.
@@ -1048,7 +1039,7 @@ static void NCR5380_main(struct work_struct *work)
                         for (tmp = (Scsi_Cmnd *) hostdata->issue_queue, prev = NULL; tmp; prev = tmp, tmp = (Scsi_Cmnd *) tmp->host_scribble) 
                         {
                                 if (prev != tmp)
-                                        dprintk(NDEBUG_LISTS, ("MAIN tmp=%p   target=%d   busy=%d lun=%d\n", tmp, tmp->target, hostdata->busy[tmp->target], tmp->lun));
+                                        dprintk(NDEBUG_LISTS, "MAIN tmp=%p   target=%d   busy=%d lun=%d\n", tmp, tmp->device->id, hostdata->busy[tmp->device->id], tmp->device->lun);
                                 /*  When we find one, remove it from the issue queue. */
                                 if (!(hostdata->busy[tmp->device->id] & (1 << tmp->device->lun))) {
                                         if (prev) {
@@ -1066,7 +1057,7 @@ static void NCR5380_main(struct work_struct *work)
                                          * On failure, we must add the command back to the
                                          *   issue queue so we can keep trying. 
                                          */
-                                        dprintk(NDEBUG_MAIN|NDEBUG_QUEUES, ("scsi%d : main() : command for target %d lun %d removed from issue_queue\n", instance->host_no, tmp->target, tmp->lun));
+                                        dprintk(NDEBUG_MAIN|NDEBUG_QUEUES, "scsi%d : main() : command for target %d lun %d removed from issue_queue\n", instance->host_no, tmp->device->id, tmp->device->lun);
         
                                         /*
                                          * A successful selection is defined as one that 
@@ -1095,7 +1086,7 @@ static void NCR5380_main(struct work_struct *work)
                                                 tmp->host_scribble = (unsigned char *) hostdata->issue_queue;
                                                 hostdata->issue_queue = tmp;
                                                 done = 0;
-                                                dprintk(NDEBUG_MAIN|NDEBUG_QUEUES, ("scsi%d : main(): select() failed, returned to issue_queue\n", instance->host_no));
+                                                dprintk(NDEBUG_MAIN|NDEBUG_QUEUES, "scsi%d : main(): select() failed, returned to issue_queue\n", instance->host_no);
                                         }
                                         /* lock held here still */
                                 }       /* if target/lun is not busy */
@@ -1125,9 +1116,9 @@ static void NCR5380_main(struct work_struct *work)
 #endif
                     && (!hostdata->time_expires || time_before_eq(hostdata->time_expires, jiffies))
                     ) {
-                        dprintk(NDEBUG_MAIN, ("scsi%d : main() : performing information transfer\n", instance->host_no));
+                        dprintk(NDEBUG_MAIN, "scsi%d : main() : performing information transfer\n", instance->host_no);
                         NCR5380_information_transfer(instance);
-                        dprintk(NDEBUG_MAIN, ("scsi%d : main() : done set false\n", instance->host_no));
+                        dprintk(NDEBUG_MAIN, "scsi%d : main() : done set false\n", instance->host_no);
                         done = 0;
                 } else
                         break;
@@ -1159,8 +1150,8 @@ static irqreturn_t NCR5380_intr(int dummy, void *dev_id)
         unsigned char basr;
         unsigned long flags;
 
-        dprintk(NDEBUG_INTR, ("scsi : NCR5380 irq %d triggered\n",
-                instance->irq));
+        dprintk(NDEBUG_INTR, "scsi : NCR5380 irq %d triggered\n",
+                instance->irq);
 
         do {
                 done = 1;
@@ -1173,14 +1164,14 @@ static irqreturn_t NCR5380_intr(int dummy, void *dev_id)
                         NCR5380_dprint(NDEBUG_INTR, instance);
                         if ((NCR5380_read(STATUS_REG) & (SR_SEL | SR_IO)) == (SR_SEL | SR_IO)) {
                                 done = 0;
-                                dprintk(NDEBUG_INTR, ("scsi%d : SEL interrupt\n", instance->host_no));
+                                dprintk(NDEBUG_INTR, "scsi%d : SEL interrupt\n", instance->host_no);
                                 NCR5380_reselect(instance);
                                 (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG);
                         } else if (basr & BASR_PARITY_ERROR) {
-                                dprintk(NDEBUG_INTR, ("scsi%d : PARITY interrupt\n", instance->host_no));
+                                dprintk(NDEBUG_INTR, "scsi%d : PARITY interrupt\n", instance->host_no);
                                 (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG);
                         } else if ((NCR5380_read(STATUS_REG) & SR_RST) == SR_RST) {
-                                dprintk(NDEBUG_INTR, ("scsi%d : RESET interrupt\n", instance->host_no));
+                                dprintk(NDEBUG_INTR, "scsi%d : RESET interrupt\n", instance->host_no);
                                 (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG);
                         } else {
 #if defined(REAL_DMA)
@@ -1210,7 +1201,7 @@ static irqreturn_t NCR5380_intr(int dummy, void *dev_id)
                                         NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
                                 }
 #else
-                                dprintk(NDEBUG_INTR, ("scsi : unknown interrupt, BASR 0x%X, MR 0x%X, SR 0x%x\n", basr, NCR5380_read(MODE_REG), NCR5380_read(STATUS_REG)));
+                                dprintk(NDEBUG_INTR, "scsi : unknown interrupt, BASR 0x%X, MR 0x%X, SR 0x%x\n", basr, NCR5380_read(MODE_REG), NCR5380_read(STATUS_REG));
                                 (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG);
 #endif
                         }
@@ -1304,7 +1295,7 @@ static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd * cmd, int tag)
         hostdata->restart_select = 0;
 
         NCR5380_dprint(NDEBUG_ARBITRATION, instance);
-        dprintk(NDEBUG_ARBITRATION, ("scsi%d : starting arbitration, id = %d\n", instance->host_no, instance->this_id));
+        dprintk(NDEBUG_ARBITRATION, "scsi%d : starting arbitration, id = %d\n", instance->host_no, instance->this_id);
 
         /* 
          * Set the phase bits to 0, otherwise the NCR5380 won't drive the 
@@ -1333,7 +1324,7 @@ static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd * cmd, int tag)
                 goto failed;
         }
 
-        dprintk(NDEBUG_ARBITRATION, ("scsi%d : arbitration complete\n", instance->host_no));
+        dprintk(NDEBUG_ARBITRATION, "scsi%d : arbitration complete\n", instance->host_no);
 
         /* 
          * The arbitration delay is 2.2us, but this is a minimum and there is 
@@ -1347,7 +1338,7 @@ static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd * cmd, int tag)
         /* Check for lost arbitration */
         if ((NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST) || (NCR5380_read(CURRENT_SCSI_DATA_REG) & hostdata->id_higher_mask) || (NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST)) {
                 NCR5380_write(MODE_REG, MR_BASE);
-                dprintk(NDEBUG_ARBITRATION, ("scsi%d : lost arbitration, deasserting MR_ARBITRATE\n", instance->host_no));
+                dprintk(NDEBUG_ARBITRATION, "scsi%d : lost arbitration, deasserting MR_ARBITRATE\n", instance->host_no);
                 goto failed;
         }
         NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_SEL);
@@ -1360,7 +1351,7 @@ static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd * cmd, int tag)
             (NCR5380_read(INITIATOR_COMMAND_REG) & ICR_ARBITRATION_LOST)) {
                 NCR5380_write(MODE_REG, MR_BASE);
                 NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-                dprintk(NDEBUG_ARBITRATION, ("scsi%d : lost arbitration, deasserting ICR_ASSERT_SEL\n", instance->host_no));
+                dprintk(NDEBUG_ARBITRATION, "scsi%d : lost arbitration, deasserting ICR_ASSERT_SEL\n", instance->host_no);
                 goto failed;
         }
         /* 
@@ -1370,7 +1361,7 @@ static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd * cmd, int tag)
 
         udelay(2);
 
-        dprintk(NDEBUG_ARBITRATION, ("scsi%d : won arbitration\n", instance->host_no));
+        dprintk(NDEBUG_ARBITRATION, "scsi%d : won arbitration\n", instance->host_no);
 
         /* 
          * Now that we have won arbitration, start Selection process, asserting 
@@ -1422,7 +1413,7 @@ static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd * cmd, int tag)
 
         udelay(1);
 
-        dprintk(NDEBUG_SELECTION, ("scsi%d : selecting target %d\n", instance->host_no, scmd_id(cmd)));
+        dprintk(NDEBUG_SELECTION, "scsi%d : selecting target %d\n", instance->host_no, scmd_id(cmd));
 
         /* 
          * The SCSI specification calls for a 250 ms timeout for the actual 
@@ -1487,7 +1478,7 @@ part2:
                 collect_stats(hostdata, cmd);
                 cmd->scsi_done(cmd);
                 NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
-                dprintk(NDEBUG_SELECTION, ("scsi%d : target did not respond within 250ms\n", instance->host_no));
+                dprintk(NDEBUG_SELECTION, "scsi%d : target did not respond within 250ms\n", instance->host_no);
                 NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
                 return 0;
         }
@@ -1520,7 +1511,7 @@ part2:
                 goto failed;
         }
 
-        dprintk(NDEBUG_SELECTION, ("scsi%d : target %d selected, going into MESSAGE OUT phase.\n", instance->host_no, cmd->device->id));
+        dprintk(NDEBUG_SELECTION, "scsi%d : target %d selected, going into MESSAGE OUT phase.\n", instance->host_no, cmd->device->id);
         tmp[0] = IDENTIFY(((instance->irq == SCSI_IRQ_NONE) ? 0 : 1), cmd->device->lun);
 
         len = 1;
@@ -1530,7 +1521,7 @@ part2:
         data = tmp;
         phase = PHASE_MSGOUT;
         NCR5380_transfer_pio(instance, &phase, &len, &data);
-        dprintk(NDEBUG_SELECTION, ("scsi%d : nexus established.\n", instance->host_no));
+        dprintk(NDEBUG_SELECTION, "scsi%d : nexus established.\n", instance->host_no);
         /* XXX need to handle errors here */
         hostdata->connected = cmd;
         hostdata->busy[cmd->device->id] |= (1 << cmd->device->lun);
@@ -1583,9 +1574,9 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, unsigned char *phase
         NCR5380_setup(instance);
 
         if (!(p & SR_IO))
-                dprintk(NDEBUG_PIO, ("scsi%d : pio write %d bytes\n", instance->host_no, c));
+                dprintk(NDEBUG_PIO, "scsi%d : pio write %d bytes\n", instance->host_no, c);
         else
-                dprintk(NDEBUG_PIO, ("scsi%d : pio read %d bytes\n", instance->host_no, c));
+                dprintk(NDEBUG_PIO, "scsi%d : pio read %d bytes\n", instance->host_no, c);
 
         /* 
          * The NCR5380 chip will only drive the SCSI bus when the 
@@ -1620,11 +1611,11 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, unsigned char *phase
                         break;
                 }
 
-                dprintk(NDEBUG_HANDSHAKE, ("scsi%d : REQ detected\n", instance->host_no));
+                dprintk(NDEBUG_HANDSHAKE, "scsi%d : REQ detected\n", instance->host_no);
 
                 /* Check for phase mismatch */
                 if ((tmp & PHASE_MASK) != p) {
-                        dprintk(NDEBUG_HANDSHAKE, ("scsi%d : phase mismatch\n", instance->host_no));
+                        dprintk(NDEBUG_HANDSHAKE, "scsi%d : phase mismatch\n", instance->host_no);
                         NCR5380_dprint_phase(NDEBUG_HANDSHAKE, instance);
                         break;
                 }
@@ -1660,7 +1651,7 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, unsigned char *phase
 
                 /* FIXME - if this fails bus reset ?? */
                 NCR5380_poll_politely(instance, STATUS_REG, SR_REQ, 0, 5*HZ);
-                dprintk(NDEBUG_HANDSHAKE, ("scsi%d : req false, handshake complete\n", instance->host_no));
+                dprintk(NDEBUG_HANDSHAKE, "scsi%d : req false, handshake complete\n", instance->host_no);
 
 /*
  * We have several special cases to consider during REQ/ACK handshaking : 
@@ -1681,7 +1672,7 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, unsigned char *phase
                 }
         } while (--c);
 
-        dprintk(NDEBUG_PIO, ("scsi%d : residual %d\n", instance->host_no, c));
+        dprintk(NDEBUG_PIO, "scsi%d : residual %d\n", instance->host_no, c);
 
         *count = c;
         *data = d;
@@ -1828,7 +1819,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase
                 c -= 2;
         }
 #endif
-        dprintk(NDEBUG_DMA, ("scsi%d : initializing DMA channel %d for %s, %d bytes %s %0x\n", instance->host_no, instance->dma_channel, (p & SR_IO) ? "reading" : "writing", c, (p & SR_IO) ? "to" : "from", (unsigned) d));
+        dprintk(NDEBUG_DMA, "scsi%d : initializing DMA channel %d for %s, %d bytes %s %0x\n", instance->host_no, instance->dma_channel, (p & SR_IO) ? "reading" : "writing", c, (p & SR_IO) ? "to" : "from", (unsigned) d);
         hostdata->dma_len = (p & SR_IO) ? NCR5380_dma_read_setup(instance, d, c) : NCR5380_dma_write_setup(instance, d, c);
 #endif
 
@@ -1857,7 +1848,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase
                 NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE);
 #endif                          /* def REAL_DMA */
 
-        dprintk(NDEBUG_DMA, ("scsi%d : mode reg = 0x%X\n", instance->host_no, NCR5380_read(MODE_REG)));
+        dprintk(NDEBUG_DMA, "scsi%d : mode reg = 0x%X\n", instance->host_no, NCR5380_read(MODE_REG));
 
         /* 
          *      On the PAS16 at least I/O recovery delays are not needed here.
@@ -1934,7 +1925,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase
                 }
         }
 
-        dprintk(NDEBUG_DMA, ("scsi%d : polled DMA transfer complete, basr 0x%X, sr 0x%X\n", instance->host_no, tmp, NCR5380_read(STATUS_REG)));
+        dprintk(NDEBUG_DMA, "scsi%d : polled DMA transfer complete, basr 0x%X, sr 0x%X\n", instance->host_no, tmp, NCR5380_read(STATUS_REG));
 
         NCR5380_write(MODE_REG, MR_BASE);
         NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
@@ -1948,7 +1939,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase
 #ifdef READ_OVERRUNS
         if (*phase == p && (p & SR_IO) && residue == 0) {
                 if (overrun) {
-                        dprintk(NDEBUG_DMA, ("Got an input overrun, using saved byte\n"));
+                        dprintk(NDEBUG_DMA, "Got an input overrun, using saved byte\n");
                         **data = saved_data;
                         *data += 1;
                         *count -= 1;
@@ -1957,13 +1948,13 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase
                         printk("No overrun??\n");
                         cnt = toPIO = 2;
                 }
-                dprintk(NDEBUG_DMA, ("Doing %d-byte PIO to 0x%X\n", cnt, *data));
+                dprintk(NDEBUG_DMA, "Doing %d-byte PIO to 0x%X\n", cnt, *data);
                 NCR5380_transfer_pio(instance, phase, &cnt, data);
                 *count -= toPIO - cnt;
         }
 #endif
 
-        dprintk(NDEBUG_DMA, ("Return with data ptr = 0x%X, count %d, last 0x%X, next 0x%X\n", *data, *count, *(*data + *count - 1), *(*data + *count)));
+        dprintk(NDEBUG_DMA, "Return with data ptr = 0x%X, count %d, last 0x%X, next 0x%X\n", *data, *count, *(*data + *count - 1), *(*data + *count));
         return 0;
 
 #elif defined(REAL_DMA)
@@ -2013,7 +2004,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase
                 foo = NCR5380_pwrite(instance, d, c);
 #else
                 int timeout;
-                dprintk(NDEBUG_C400_PWRITE, ("About to pwrite %d bytes\n", c));
+                dprintk(NDEBUG_C400_PWRITE, "About to pwrite %d bytes\n", c);
                 if (!(foo = NCR5380_pwrite(instance, d, c))) {
                         /*
                          * Wait for the last byte to be sent.  If REQ is being asserted for 
@@ -2024,19 +2015,19 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase
                                 while (!(NCR5380_read(BUS_AND_STATUS_REG) & BASR_DRQ) && (NCR5380_read(BUS_AND_STATUS_REG) & BASR_PHASE_MATCH));
 
                                 if (!timeout)
-                                        dprintk(NDEBUG_LAST_BYTE_SENT, ("scsi%d : timed out on last byte\n", instance->host_no));
+                                        dprintk(NDEBUG_LAST_BYTE_SENT, "scsi%d : timed out on last byte\n", instance->host_no);
 
                                 if (hostdata->flags & FLAG_CHECK_LAST_BYTE_SENT) {
                                         hostdata->flags &= ~FLAG_CHECK_LAST_BYTE_SENT;
                                         if (NCR5380_read(TARGET_COMMAND_REG) & TCR_LAST_BYTE_SENT) {
                                                 hostdata->flags |= FLAG_HAS_LAST_BYTE_SENT;
-                                                dprintk(NDEBUG_LAST_WRITE_SENT, ("scsi%d : last bit sent works\n", instance->host_no));
+                                                dprintk(NDEBUG_LAST_BYTE_SENT, "scsi%d : last byte sent works\n", instance->host_no);
                                         }
                                 }
                         } else {
-                                dprintk(NDEBUG_C400_PWRITE, ("Waiting for LASTBYTE\n"));
+                                dprintk(NDEBUG_C400_PWRITE, "Waiting for LASTBYTE\n");
                                 while (!(NCR5380_read(TARGET_COMMAND_REG) & TCR_LAST_BYTE_SENT));
-                                dprintk(NDEBUG_C400_PWRITE, ("Got LASTBYTE\n"));
+                                dprintk(NDEBUG_C400_PWRITE, "Got LASTBYTE\n");
                         }
                 }
 #endif
@@ -2045,9 +2036,9 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase
         NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
 
         if ((!(p & SR_IO)) && (hostdata->flags & FLAG_NCR53C400)) {
-                dprintk(NDEBUG_C400_PWRITE, ("53C400w: Checking for IRQ\n"));
+                dprintk(NDEBUG_C400_PWRITE, "53C400w: Checking for IRQ\n");
                 if (NCR5380_read(BUS_AND_STATUS_REG) & BASR_IRQ) {
-                        dprintk(NDEBUG_C400_PWRITE, ("53C400w:    got it, reading reset interrupt reg\n"));
+                        dprintk(NDEBUG_C400_PWRITE, "53C400w:    got it, reading reset interrupt reg\n");
                         NCR5380_read(RESET_PARITY_INTERRUPT_REG);
                 } else {
                         printk("53C400w:    IRQ NOT THERE!\n");
@@ -2139,7 +2130,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                         --cmd->SCp.buffers_residual;
                                         cmd->SCp.this_residual = cmd->SCp.buffer->length;
                                         cmd->SCp.ptr = sg_virt(cmd->SCp.buffer);
-                                        dprintk(NDEBUG_INFORMATION, ("scsi%d : %d bytes and %d buffers left\n", instance->host_no, cmd->SCp.this_residual, cmd->SCp.buffers_residual));
+                                        dprintk(NDEBUG_INFORMATION, "scsi%d : %d bytes and %d buffers left\n", instance->host_no, cmd->SCp.this_residual, cmd->SCp.buffers_residual);
                                 }
                                 /*
                                  * The preferred transfer method is going to be 
@@ -2219,7 +2210,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                 case LINKED_FLG_CMD_COMPLETE:
                                         /* Accept message by clearing ACK */
                                         NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-                                        dprintk(NDEBUG_LINKED, ("scsi%d : target %d lun %d linked command complete.\n", instance->host_no, cmd->device->id, cmd->device->lun));
+                                        dprintk(NDEBUG_LINKED, "scsi%d : target %d lun %d linked command complete.\n", instance->host_no, cmd->device->id, cmd->device->lun);
                                         /* 
                                          * Sanity check : A linked command should only terminate with
                                          * one of these messages if there are more linked commands
@@ -2235,7 +2226,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                         /* The next command is still part of this process */
                                         cmd->next_link->tag = cmd->tag;
                                         cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8);
-                                        dprintk(NDEBUG_LINKED, ("scsi%d : target %d lun %d linked request done, calling scsi_done().\n", instance->host_no, cmd->device->id, cmd->device->lun));
+                                        dprintk(NDEBUG_LINKED, "scsi%d : target %d lun %d linked request done, calling scsi_done().\n", instance->host_no, cmd->device->id, cmd->device->lun);
                                         collect_stats(hostdata, cmd);
                                         cmd->scsi_done(cmd);
                                         cmd = hostdata->connected;
@@ -2247,7 +2238,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                         sink = 1;
                                         NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
                                         hostdata->connected = NULL;
-                                        dprintk(NDEBUG_QUEUES, ("scsi%d : command for target %d, lun %d completed\n", instance->host_no, cmd->device->id, cmd->device->lun));
+                                        dprintk(NDEBUG_QUEUES, "scsi%d : command for target %d, lun %d completed\n", instance->host_no, cmd->device->id, cmd->device->lun);
                                         hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
 
                                         /* 
@@ -2281,13 +2272,13 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                         if ((cmd->cmnd[0] != REQUEST_SENSE) && (status_byte(cmd->SCp.Status) == CHECK_CONDITION)) {
                                                 scsi_eh_prep_cmnd(cmd, &hostdata->ses, NULL, 0, ~0);
 
-                                                dprintk(NDEBUG_AUTOSENSE, ("scsi%d : performing request sense\n", instance->host_no));
+                                                dprintk(NDEBUG_AUTOSENSE, "scsi%d : performing request sense\n", instance->host_no);
 
                                                 LIST(cmd, hostdata->issue_queue);
                                                 cmd->host_scribble = (unsigned char *)
                                                     hostdata->issue_queue;
                                                 hostdata->issue_queue = (Scsi_Cmnd *) cmd;
-                                                dprintk(NDEBUG_QUEUES, ("scsi%d : REQUEST SENSE added to head of issue queue\n", instance->host_no));
+                                                dprintk(NDEBUG_QUEUES, "scsi%d : REQUEST SENSE added to head of issue queue\n", instance->host_no);
                                         } else
 #endif                          /* def AUTOSENSE */
                                         {
@@ -2327,7 +2318,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                                     hostdata->disconnected_queue;
                                                 hostdata->connected = NULL;
                                                 hostdata->disconnected_queue = cmd;
-                                                dprintk(NDEBUG_QUEUES, ("scsi%d : command for target %d lun %d was moved from connected to" "  the disconnected_queue\n", instance->host_no, cmd->device->id, cmd->device->lun));
+                                                dprintk(NDEBUG_QUEUES, "scsi%d : command for target %d lun %d was moved from connected to" "  the disconnected_queue\n", instance->host_no, cmd->device->id, cmd->device->lun);
                                                 /* 
                                                  * Restore phase bits to 0 so an interrupted selection, 
                                                  * arbitration can resume.
@@ -2373,14 +2364,14 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                         extended_msg[0] = EXTENDED_MESSAGE;
                                         /* Accept first byte by clearing ACK */
                                         NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-                                        dprintk(NDEBUG_EXTENDED, ("scsi%d : receiving extended message\n", instance->host_no));
+                                        dprintk(NDEBUG_EXTENDED, "scsi%d : receiving extended message\n", instance->host_no);
 
                                         len = 2;
                                         data = extended_msg + 1;
                                         phase = PHASE_MSGIN;
                                         NCR5380_transfer_pio(instance, &phase, &len, &data);
 
-                                        dprintk(NDEBUG_EXTENDED, ("scsi%d : length=%d, code=0x%02x\n", instance->host_no, (int) extended_msg[1], (int) extended_msg[2]));
+                                        dprintk(NDEBUG_EXTENDED, "scsi%d : length=%d, code=0x%02x\n", instance->host_no, (int) extended_msg[1], (int) extended_msg[2]);
 
                                         if (!len && extended_msg[1] <= (sizeof(extended_msg) - 1)) {
                                                 /* Accept third byte by clearing ACK */
@@ -2390,7 +2381,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                                 phase = PHASE_MSGIN;
 
                                                 NCR5380_transfer_pio(instance, &phase, &len, &data);
-                                                dprintk(NDEBUG_EXTENDED, ("scsi%d : message received, residual %d\n", instance->host_no, len));
+                                                dprintk(NDEBUG_EXTENDED, "scsi%d : message received, residual %d\n", instance->host_no, len);
 
                                                 switch (extended_msg[2]) {
                                                 case EXTENDED_SDTR:
@@ -2456,7 +2447,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                 NCR5380_transfer_pio(instance, &phase, &len, &data);
                                 if (!cmd->device->disconnect && should_disconnect(cmd->cmnd[0])) {
                                         NCR5380_set_timer(hostdata, USLEEP_SLEEP);
-                                        dprintk(NDEBUG_USLEEP, ("scsi%d : issued command, sleeping until %ul\n", instance->host_no, hostdata->time_expires));
+                                        dprintk(NDEBUG_USLEEP, "scsi%d : issued command, sleeping until %lu\n", instance->host_no, hostdata->time_expires);
                                         return;
                                 }
                                 break;
@@ -2468,7 +2459,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                 break;
                         default:
                                 printk("scsi%d : unknown phase\n", instance->host_no);
-                                NCR5380_dprint(NDEBUG_ALL, instance);
+                                NCR5380_dprint(NDEBUG_ANY, instance);
                         }       /* switch(phase) */
                 }               /* if (tmp * SR_REQ) */
                 else {
@@ -2476,7 +2467,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                          */
                         if (!cmd->device->disconnect && time_after_eq(jiffies, poll_time)) {
                                 NCR5380_set_timer(hostdata, USLEEP_SLEEP);
-                                dprintk(NDEBUG_USLEEP, ("scsi%d : poll timed out, sleeping until %ul\n", instance->host_no, hostdata->time_expires));
+                                dprintk(NDEBUG_USLEEP, "scsi%d : poll timed out, sleeping until %lu\n", instance->host_no, hostdata->time_expires);
                                 return;
                         }
                 }
@@ -2517,7 +2508,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) {
         hostdata->restart_select = 1;
 
         target_mask = NCR5380_read(CURRENT_SCSI_DATA_REG) & ~(hostdata->id_mask);
-        dprintk(NDEBUG_SELECTION, ("scsi%d : reselect\n", instance->host_no));
+        dprintk(NDEBUG_SELECTION, "scsi%d : reselect\n", instance->host_no);
 
         /* 
          * At this point, we have detected that our SCSI ID is on the bus,
@@ -2597,7 +2588,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) {
                 do_abort(instance);
         } else {
                 hostdata->connected = tmp;
-                dprintk(NDEBUG_RESELECTION, ("scsi%d : nexus established, target = %d, lun = %d, tag = %d\n", instance->host_no, tmp->target, tmp->lun, tmp->tag));
+                dprintk(NDEBUG_RESELECTION, "scsi%d : nexus established, target = %d, lun = %d, tag = %d\n", instance->host_no, tmp->device->id, tmp->device->lun, tmp->tag);
         }
 }
 
@@ -2682,8 +2673,8 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
 
         NCR5380_setup(instance);
 
-        dprintk(NDEBUG_ABORT, ("scsi%d : abort called\n", instance->host_no));
-        dprintk(NDEBUG_ABORT, ("        basr 0x%X, sr 0x%X\n", NCR5380_read(BUS_AND_STATUS_REG), NCR5380_read(STATUS_REG)));
+        dprintk(NDEBUG_ABORT, "scsi%d : abort called\n", instance->host_no);
+        dprintk(NDEBUG_ABORT, "        basr 0x%X, sr 0x%X\n", NCR5380_read(BUS_AND_STATUS_REG), NCR5380_read(STATUS_REG));
 
 #if 0
 /*
@@ -2693,7 +2684,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
  */
 
         if (hostdata->connected == cmd) {
-                dprintk(NDEBUG_ABORT, ("scsi%d : aborting connected command\n", instance->host_no));
+                dprintk(NDEBUG_ABORT, "scsi%d : aborting connected command\n", instance->host_no);
                 hostdata->aborted = 1;
 /*
  * We should perform BSY checking, and make sure we haven't slipped
@@ -2721,14 +2712,14 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
  *          from the issue queue.
  */
  
-        dprintk(NDEBUG_ABORT, ("scsi%d : abort going into loop.\n", instance->host_no));
+        dprintk(NDEBUG_ABORT, "scsi%d : abort going into loop.\n", instance->host_no);
         for (prev = (Scsi_Cmnd **) & (hostdata->issue_queue), tmp = (Scsi_Cmnd *) hostdata->issue_queue; tmp; prev = (Scsi_Cmnd **) & (tmp->host_scribble), tmp = (Scsi_Cmnd *) tmp->host_scribble)
                 if (cmd == tmp) {
                         REMOVE(5, *prev, tmp, tmp->host_scribble);
                         (*prev) = (Scsi_Cmnd *) tmp->host_scribble;
                         tmp->host_scribble = NULL;
                         tmp->result = DID_ABORT << 16;
-                        dprintk(NDEBUG_ABORT, ("scsi%d : abort removed command from issue queue.\n", instance->host_no));
+                        dprintk(NDEBUG_ABORT, "scsi%d : abort removed command from issue queue.\n", instance->host_no);
                         tmp->scsi_done(tmp);
                         return SUCCESS;
                 }
@@ -2750,7 +2741,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
  */
 
         if (hostdata->connected) {
-                dprintk(NDEBUG_ABORT, ("scsi%d : abort failed, command connected.\n", instance->host_no));
+                dprintk(NDEBUG_ABORT, "scsi%d : abort failed, command connected.\n", instance->host_no);
                 return FAILED;
         }
 /*
@@ -2780,11 +2771,11 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
 
         for (tmp = (Scsi_Cmnd *) hostdata->disconnected_queue; tmp; tmp = (Scsi_Cmnd *) tmp->host_scribble)
                 if (cmd == tmp) {
-                        dprintk(NDEBUG_ABORT, ("scsi%d : aborting disconnected command.\n", instance->host_no));
+                        dprintk(NDEBUG_ABORT, "scsi%d : aborting disconnected command.\n", instance->host_no);
 
                         if (NCR5380_select(instance, cmd, (int) cmd->tag))
                                 return FAILED;
-                        dprintk(NDEBUG_ABORT, ("scsi%d : nexus reestablished.\n", instance->host_no));
+                        dprintk(NDEBUG_ABORT, "scsi%d : nexus reestablished.\n", instance->host_no);
 
                         do_abort(instance);