Skip to content

Commit

Permalink
target: avoid multiple outputs in scsi_dump_inquiry()
Browse files Browse the repository at this point in the history
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: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
  • Loading branch information
Sebastian Andrzej Siewior authored and Nicholas Bellinger committed Jan 18, 2012
1 parent 91ec1d3 commit e59a41b
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions drivers/target/target_core_transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -1255,32 +1255,34 @@ static void core_setup_task_attr_emulation(struct se_device *dev)
static void scsi_dump_inquiry(struct se_device *dev)
{
struct t10_wwn *wwn = &dev->se_sub_dev->t10_wwn;
char buf[17];
int i, device_type;
/*
* Print Linux/SCSI style INQUIRY formatting to the kernel ring buffer
*/
pr_debug(" Vendor: ");
for (i = 0; i < 8; i++)
if (wwn->vendor[i] >= 0x20)
pr_debug("%c", wwn->vendor[i]);
buf[i] = wwn->vendor[i];
else
pr_debug(" ");
buf[i] = ' ';
buf[i] = '\0';
pr_debug(" Vendor: %s\n", buf);

pr_debug(" Model: ");
for (i = 0; i < 16; i++)
if (wwn->model[i] >= 0x20)
pr_debug("%c", wwn->model[i]);
buf[i] = wwn->model[i];
else
pr_debug(" ");
buf[i] = ' ';
buf[i] = '\0';
pr_debug(" Model: %s\n", buf);

pr_debug(" Revision: ");
for (i = 0; i < 4; i++)
if (wwn->revision[i] >= 0x20)
pr_debug("%c", wwn->revision[i]);
buf[i] = wwn->revision[i];
else
pr_debug(" ");

pr_debug("\n");
buf[i] = ' ';
buf[i] = '\0';
pr_debug(" Revision: %s\n", buf);

device_type = dev->transport->get_device_type(dev);
pr_debug(" Type: %s ", scsi_device_type(device_type));
Expand Down

0 comments on commit e59a41b

Please sign in to comment.