Merge tag 'pinctrl-v3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[karo-tx-linux.git] / drivers / scsi / scsi.c

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 9b3829931f40d95c2cdd4e673c33a56b510edc9b..c9c3b579eeced06760dec98221547fd0f56a35de 100644 (file)
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -531,7 +531,7 @@ void scsi_log_send(struct scsi_cmnd *cmd)
         *
         * 3: same as 2
         *
-        * 4: same as 3 plus dump extra junk
+        * 4: same as 3
         */
        if (unlikely(scsi_logging_level)) {
                level = SCSI_LOG_LEVEL(SCSI_LOG_MLQUEUE_SHIFT,
@@ -540,13 +540,6 @@ void scsi_log_send(struct scsi_cmnd *cmd)
                        scmd_printk(KERN_INFO, cmd,
                                    "Send: scmd 0x%p\n", cmd);
                        scsi_print_command(cmd);
-                       if (level > 3) {
-                               printk(KERN_INFO "buffer = 0x%p, bufflen = %d,"
-                                      " queuecommand 0x%p\n",
-                                       scsi_sglist(cmd), scsi_bufflen(cmd),
-                                       cmd->device->host->hostt->queuecommand);
-
-                       }
                }
        }
 }
@@ -572,7 +565,7 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
                                       SCSI_LOG_MLCOMPLETE_BITS);
                if (((level > 0) && (cmd->result || disposition != SUCCESS)) ||
                    (level > 1)) {
-                       scsi_print_result(cmd, "Done: ", disposition);
+                       scsi_print_result(cmd, "Done", disposition);
                        scsi_print_command(cmd);
                        if (status_byte(cmd->result) & CHECK_CONDITION)
                                scsi_print_sense(cmd);