Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull first round of SCSI updates from James Bottomley:
 "This is the usual grab bag of driver updates (hpsa, storvsc, mp2sas,
  megaraid_sas, ses) plus an assortment of minor updates.

  There's also an update to ufs which adds new phy drivers and finally a
  new logging infrastructure for SCSI"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (114 commits)
  scsi_logging: return void for dev_printk() functions
  scsi: print single-character strings with seq_putc
  scsi: merge consecutive seq_puts calls
  scsi: replace seq_printf with seq_puts
  aha152x: replace seq_printf with seq_puts
  advansys: replace seq_printf with seq_puts
  scsi: remove SPRINTF macro
  sg: remove an unused variable
  hpsa: Use local workqueues instead of system workqueues
  hpsa: add in P840ar controller model name
  hpsa: add in gen9 controller model names
  hpsa: detect and report failures changing controller transport modes
  hpsa: shorten the wait for the CISS doorbell mode change ack
  hpsa: refactor duplicated scan completion code into a new routine
  hpsa: move SG descriptor set-up out of hpsa_scatter_gather()
  hpsa: do not use function pointers in fast path command submission
  hpsa: print CDBs instead of kernel virtual addresses for uncommon errors
  hpsa: do not use a void pointer for scsi_cmd field of struct CommandList
  hpsa: return failed from device reset/abort handlers
  hpsa: check for ctlr lockup after command allocation in main io path
  ...

1 files changed, 9 insertions, 11 deletions

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index a9f5aed32d39..d2029a462e2c 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2481,7 +2481,6 @@ static void ata_eh_link_report(struct ata_link *link)
         for (tag = 0; tag < ATA_MAX_QUEUE; tag++) {
                 struct ata_queued_cmd *qc = __ata_qc_from_tag(ap, tag);
                 struct ata_taskfile *cmd = &qc->tf, *res = &qc->result_tf;
-                const u8 *cdb = qc->cdb;
                 char data_buf[20] = "";
                 char cdb_buf[70] = "";
 
@@ -2509,16 +2508,15 @@ static void ata_eh_link_report(struct ata_link *link)
                 }
 
                 if (ata_is_atapi(qc->tf.protocol)) {
-                        if (qc->scsicmd)
-                                scsi_print_command(qc->scsicmd);
-                        else
-                                snprintf(cdb_buf, sizeof(cdb_buf),
-                                 "cdb %02x %02x %02x %02x %02x %02x %02x %02x  "
-                                 "%02x %02x %02x %02x %02x %02x %02x %02x\n         ",
-                                 cdb[0], cdb[1], cdb[2], cdb[3],
-                                 cdb[4], cdb[5], cdb[6], cdb[7],
-                                 cdb[8], cdb[9], cdb[10], cdb[11],
-                                 cdb[12], cdb[13], cdb[14], cdb[15]);
+                        const u8 *cdb = qc->cdb;
+                        size_t cdb_len = qc->dev->cdb_len;
+
+                        if (qc->scsicmd) {
+                                cdb = qc->scsicmd->cmnd;
+                                cdb_len = qc->scsicmd->cmd_len;
+                        }
+                        __scsi_format_command(cdb_buf, sizeof(cdb_buf),
+                                              cdb, cdb_len);
                 } else {
                         const char *descr = ata_get_cmd_descript(cmd->command);
                         if (descr)