1 files changed, 11 insertions, 15 deletions

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index a5711d545d71..0be60bba58d3 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -410,9 +410,7 @@ void scsi_log_send(struct scsi_cmnd *cmd)
                                        SCSI_LOG_MLQUEUE_BITS);
                 if (level > 1) {
                         sdev = cmd->device;
-                        printk(KERN_INFO "scsi <%d:%d:%d:%d> send ",
-                               sdev->host->host_no, sdev->channel, sdev->id,
-                               sdev->lun);
+                        sdev_printk(KERN_INFO, sdev, "send ");
                         if (level > 2)
                                 printk("0x%p ", cmd);
                         /*
@@ -456,9 +454,7 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
                 if (((level > 0) && (cmd->result || disposition != SUCCESS)) ||
                     (level > 1)) {
                         sdev = cmd->device;
-                        printk(KERN_INFO "scsi <%d:%d:%d:%d> done ",
-                               sdev->host->host_no, sdev->channel, sdev->id,
-                               sdev->lun);
+                        sdev_printk(KERN_INFO, sdev, "done ");
                         if (level > 2)
                                 printk("0x%p ", cmd);
                         /*
@@ -810,9 +806,9 @@ static void scsi_softirq(struct softirq_action *h)
                 disposition = scsi_decide_disposition(cmd);
                 if (disposition != SUCCESS &&
                     time_before(cmd->jiffies_at_alloc + wait_for, jiffies)) {
-                        dev_printk(KERN_ERR, &cmd->device->sdev_gendev, 
-                                   "timing out command, waited %lus\n",
-                                   wait_for/HZ);
+                        sdev_printk(KERN_ERR, cmd->device,
+                                    "timing out command, waited %lus\n",
+                                    wait_for/HZ);
                         disposition = SUCCESS;
                 }
                         
@@ -893,8 +889,9 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
         if (SCSI_SENSE_VALID(cmd))
                 cmd->result |= (DRIVER_SENSE << 24);
 
-        SCSI_LOG_MLCOMPLETE(4, printk("Notifying upper driver of completion "
-                                "for device %d %x\n", sdev->id, cmd->result));
+        SCSI_LOG_MLCOMPLETE(4, sdev_printk(KERN_INFO, sdev,
+                                "Notifying upper driver of completion "
+                                "(result %x)\n", cmd->result));
 
         /*
          * We can get here with use_sg=0, causing a panic in the upper level
@@ -970,10 +967,9 @@ void scsi_adjust_queue_depth(struct scsi_device *sdev, int tagged, int tags)
                         sdev->simple_tags = 1;
                         break;
                 default:
-                        printk(KERN_WARNING "(scsi%d:%d:%d:%d) "
-                                "scsi_adjust_queue_depth, bad queue type, "
-                                "disabled\n", sdev->host->host_no,
-                                sdev->channel, sdev->id, sdev->lun); 
+                        sdev_printk(KERN_WARNING, sdev,
+                                    "scsi_adjust_queue_depth, bad queue type, "
+                                    "disabled\n");
                 case 0:
                         sdev->ordered_tags = sdev->simple_tags = 0;
                         sdev->queue_depth = tags;