1 files changed, 9 insertions, 16 deletions

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 52b348c36d56..dd6a9f61bdf1 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -241,11 +241,10 @@ static inline void scsi_eh_prt_fail_stats(struct Scsi_Host *shost,
 
                 if (cmd_cancel || cmd_failed) {
                         SCSI_LOG_ERROR_RECOVERY(3,
-                                printk("%s: %d:%d:%d:%d cmds failed: %d,"
-                                       " cancel: %d\n",
-                                       __FUNCTION__, shost->host_no,
-                                       sdev->channel, sdev->id, sdev->lun,
-                                       cmd_failed, cmd_cancel));
+                                sdev_printk(KERN_INFO, sdev,
+                                            "%s: cmds failed: %d, cancel: %d\n",
+                                            __FUNCTION__, cmd_failed,
+                                            cmd_cancel));
                         cmd_cancel = 0;
                         cmd_failed = 0;
                         ++devices_failed;
@@ -1174,13 +1173,9 @@ static void scsi_eh_offline_sdevs(struct list_head *work_q,
         struct scsi_cmnd *scmd, *next;
 
         list_for_each_entry_safe(scmd, next, work_q, eh_entry) {
-                printk(KERN_INFO "scsi: Device offlined - not"
-                                " ready after error recovery: host"
-                                " %d channel %d id %d lun %d\n",
-                                scmd->device->host->host_no,
-                                scmd->device->channel,
-                                scmd->device->id,
-                                scmd->device->lun);
+                sdev_printk(KERN_INFO, scmd->device,
+                            "scsi: Device offlined - not"
+                            " ready after error recovery\n");
                 scsi_device_set_state(scmd->device, SDEV_OFFLINE);
                 if (scmd->eh_eflags & SCSI_EH_CANCEL_CMD) {
                         /*
@@ -1342,10 +1337,8 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
                 return SUCCESS;
 
         case RESERVATION_CONFLICT:
-                printk(KERN_INFO "scsi: reservation conflict: host"
-                                " %d channel %d id %d lun %d\n",
-                       scmd->device->host->host_no, scmd->device->channel,
-                       scmd->device->id, scmd->device->lun);
+                sdev_printk(KERN_INFO, scmd->device,
+                            "reservation conflict\n");
                 return SUCCESS; /* causes immediate i/o error */
         default:
                 return FAILED;