Commit e59a41b6 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Nicholas Bellinger

target: avoid multiple outputs in scsi_dump_inquiry()

The multiple calls to pr_debug() each with one letter results in a new
line. This patch merges the multiple requests into one call per line
so we don't have the multiple line cuts.
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 91ec1d35
...@@ -1255,32 +1255,34 @@ static void core_setup_task_attr_emulation(struct se_device *dev) ...@@ -1255,32 +1255,34 @@ static void core_setup_task_attr_emulation(struct se_device *dev)
static void scsi_dump_inquiry(struct se_device *dev) static void scsi_dump_inquiry(struct se_device *dev)
{ {
struct t10_wwn *wwn = &dev->se_sub_dev->t10_wwn; struct t10_wwn *wwn = &dev->se_sub_dev->t10_wwn;
char buf[17];
int i, device_type; int i, device_type;
/* /*
* Print Linux/SCSI style INQUIRY formatting to the kernel ring buffer * Print Linux/SCSI style INQUIRY formatting to the kernel ring buffer
*/ */
pr_debug(" Vendor: ");
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
if (wwn->vendor[i] >= 0x20) if (wwn->vendor[i] >= 0x20)
pr_debug("%c", wwn->vendor[i]); buf[i] = wwn->vendor[i];
else else
pr_debug(" "); buf[i] = ' ';
buf[i] = '\0';
pr_debug(" Vendor: %s\n", buf);
pr_debug(" Model: ");
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
if (wwn->model[i] >= 0x20) if (wwn->model[i] >= 0x20)
pr_debug("%c", wwn->model[i]); buf[i] = wwn->model[i];
else else
pr_debug(" "); buf[i] = ' ';
buf[i] = '\0';
pr_debug(" Model: %s\n", buf);
pr_debug(" Revision: ");
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
if (wwn->revision[i] >= 0x20) if (wwn->revision[i] >= 0x20)
pr_debug("%c", wwn->revision[i]); buf[i] = wwn->revision[i];
else else
pr_debug(" "); buf[i] = ' ';
buf[i] = '\0';
pr_debug("\n"); pr_debug(" Revision: %s\n", buf);
device_type = dev->transport->get_device_type(dev); device_type = dev->transport->get_device_type(dev);
pr_debug(" Type: %s ", scsi_device_type(device_type)); pr_debug(" Type: %s ", scsi_device_type(device_type));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment