1 files changed, 12 insertions, 9 deletions

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 23392ae7df8b..cc9ecb35b412 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -1247,13 +1247,13 @@ static void collect_stats(struct NCR5380_hostdata *hostdata, Scsi_Cmnd * cmd)
         case WRITE:
         case WRITE_6:
         case WRITE_10:
-                hostdata->time_write[cmd->device->id] += (jiffies - hostdata->timebase);
+                hostdata->time_write[scmd_id(cmd)] += (jiffies - hostdata->timebase);
                 hostdata->pendingw--;
                 break;
         case READ:
         case READ_6:
         case READ_10:
-                hostdata->time_read[cmd->device->id] += (jiffies - hostdata->timebase);
+                hostdata->time_read[scmd_id(cmd)] += (jiffies - hostdata->timebase);
                 hostdata->pendingr--;
                 break;
         }
@@ -1385,7 +1385,7 @@ static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd * cmd, int tag)
          * the host and target ID's on the SCSI bus.
          */
 
-        NCR5380_write(OUTPUT_DATA_REG, (hostdata->id_mask | (1 << cmd->device->id)));
+        NCR5380_write(OUTPUT_DATA_REG, (hostdata->id_mask | (1 << scmd_id(cmd))));
 
         /* 
          * Raise ATN while SEL is true before BSY goes false from arbitration,
@@ -1430,7 +1430,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, cmd->device->id));
+        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 
@@ -1483,7 +1483,7 @@ part2:
 
         if (!(NCR5380_read(STATUS_REG) & SR_BSY)) {
                 NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
-                if (hostdata->targets_present & (1 << cmd->device->id)) {
+                if (hostdata->targets_present & (1 << scmd_id(cmd))) {
                         printk(KERN_DEBUG "scsi%d : weirdness\n", instance->host_no);
                         if (hostdata->restart_select)
                                 printk(KERN_DEBUG "\trestart select\n");
@@ -1499,7 +1499,7 @@ part2:
                 NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
                 return 0;
         }
-        hostdata->targets_present |= (1 << cmd->device->id);
+        hostdata->targets_present |= (1 << scmd_id(cmd));
 
         /*
          * Since we followed the SCSI spec, and raised ATN while SEL 
@@ -2190,7 +2190,8 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                                  * If the watchdog timer fires, all future accesses to this
                                                  * device will use the polled-IO.
                                                  */
-                                                printk("scsi%d : switching target %d lun %d to slow handshake\n", instance->host_no, cmd->device->id, cmd->device->lun);
+                                                scmd_printk(KERN_INFO, cmd,
+                                                            "switching to slow handshake\n");
                                                 cmd->device->borken = 1;
                                                 NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN);
                                                 sink = 1;
@@ -2429,9 +2430,11 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                                 scsi_print_msg(extended_msg);
                                                 printk("\n");
                                         } else if (tmp != EXTENDED_MESSAGE)
-                                                printk("scsi%d: rejecting unknown message %02x from target %d, lun %d\n", instance->host_no, tmp, cmd->device->id, cmd->device->lun);
+                                                scmd_printk(KERN_INFO, cmd,
+                                                        "rejecting unknown message %02x\n",tmp);
                                         else
-                                                printk("scsi%d: rejecting unknown extended message code %02x, length %d from target %d, lun %d\n", instance->host_no, extended_msg[1], extended_msg[0], cmd->device->id, cmd->device->lun);
+                                                scmd_printk(KERN_INFO, cmd,
+                                                        "rejecting unknown extended message code %02x, length %d\n", extended_msg[1], extended_msg[0]);
 
                                         msgout = MESSAGE_REJECT;
                                         NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN);