From: Hannes Reinecke <hare@suse.de>
To: James Bottomley <jbottomley@parallels.com>
Cc: Christoph Hellwig <hch@infradead.org>,
Robert Elliott <elliott@hp.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCH 08/27] fas216: Update logging messages
Date: Fri, 24 Oct 2014 14:26:48 +0200 [thread overview]
Message-ID: <1414153627-2863-9-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1414153627-2863-1-git-send-email-hare@suse.de>
Update logging messages to use dev_printk() variants for correct
device annotations.
Reviewed-by: Robert Elliott <elliott@hp.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/arm/fas216.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 7fc6fd3..cea3463 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -308,8 +308,7 @@ static void fas216_log_command(FAS216_Info *info, int level,
fas216_do_log(info, '0' + SCpnt->device->id, fmt, args);
va_end(args);
- printk(" CDB: ");
- __scsi_print_command(SCpnt->cmnd);
+ scsi_print_command(SCpnt);
}
static void
@@ -2079,12 +2078,11 @@ fas216_std_done(FAS216_Info *info, struct scsi_cmnd *SCpnt, unsigned int result)
break;
default:
- printk(KERN_ERR "scsi%d.%c: incomplete data transfer "
- "detected: res=%08X ptr=%p len=%X CDB: ",
- info->host->host_no, '0' + SCpnt->device->id,
- SCpnt->result, info->scsi.SCp.ptr,
- info->scsi.SCp.this_residual);
- __scsi_print_command(SCpnt->cmnd);
+ scmd_printk(KERN_ERR, SCpnt,
+ "incomplete data transfer detected: res=%08X ptr=%p len=%X\n",
+ SCpnt->result, info->scsi.SCp.ptr,
+ info->scsi.SCp.this_residual);
+ scsi_print_command(SCpnt);
set_host_byte(SCpnt, DID_ERROR);
goto request_sense;
}
@@ -2157,12 +2155,11 @@ static void fas216_done(FAS216_Info *info, unsigned int result)
* to transfer, we should not have a valid pointer.
*/
if (info->scsi.SCp.ptr && info->scsi.SCp.this_residual == 0) {
- printk("scsi%d.%c: zero bytes left to transfer, but "
- "buffer pointer still valid: ptr=%p len=%08x CDB: ",
- info->host->host_no, '0' + SCpnt->device->id,
- info->scsi.SCp.ptr, info->scsi.SCp.this_residual);
+ scmd_printk(KERN_INFO, SCpnt,
+ "zero bytes left to transfer, but buffer pointer still valid: ptr=%p len=%08x\n",
+ info->scsi.SCp.ptr, info->scsi.SCp.this_residual);
info->scsi.SCp.ptr = NULL;
- __scsi_print_command(SCpnt->cmnd);
+ scsi_print_command(SCpnt);
}
/*
@@ -2663,8 +2660,7 @@ int fas216_eh_host_reset(struct scsi_cmnd *SCpnt)
fas216_checkmagic(info);
- printk("scsi%d.%c: %s: resetting host\n",
- info->host->host_no, '0' + SCpnt->device->id, __func__);
+ fas216_log(info, LOG_ERROR, "resetting host");
/*
* Reset the SCSI chip.
--
1.8.5.2
next prev parent reply other threads:[~2014-10-24 12:27 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-24 12:26 [PATCHv8 00/27] scsi logging update (the boring part) Hannes Reinecke
2014-10-24 12:26 ` [PATCH 01/27] Remove scsi_cmd_print_sense_hdr() Hannes Reinecke
2014-10-24 12:26 ` [PATCH 02/27] sd: Remove scsi_print_sense() in sd_done() Hannes Reinecke
2014-10-24 12:26 ` [PATCH 03/27] aha152x: Debug output update and whitespace cleanup Hannes Reinecke
2014-10-24 12:26 ` [PATCH 04/27] scsi: introduce sdev_prefix_printk() Hannes Reinecke
2014-10-24 12:26 ` [PATCH 05/27] scsi: Use sdev as argument for sense code printing Hannes Reinecke
2014-10-24 12:26 ` [PATCH 06/27] acornscsi: use scsi_print_command() Hannes Reinecke
2014-10-24 12:26 ` [PATCH 07/27] fas216: Return DID_ERROR for incomplete data transfer Hannes Reinecke
2014-10-24 12:26 ` Hannes Reinecke [this message]
2014-10-24 12:26 ` [PATCH 09/27] 53c700: remove scsi_print_sense() usage Hannes Reinecke
2014-10-24 12:26 ` [PATCH 10/27] scsi: stop decoding if scsi_normalize_sense() fails Hannes Reinecke
2014-10-24 12:26 ` [PATCH 11/27] scsi: do not decode sense extras Hannes Reinecke
2014-10-24 12:26 ` [PATCH 12/27] scsi: use 'bool' as return value for scsi_normalize_sense() Hannes Reinecke
2014-10-24 12:26 ` [PATCH 13/27] scsi: remove scsi_print_status() Hannes Reinecke
2014-10-24 12:26 ` [PATCH 14/27] Implement scsi_opcode_sa_name Hannes Reinecke
2014-10-24 12:26 ` [PATCH 15/27] scsi: merge print_opcode_name() Hannes Reinecke
2014-10-24 12:26 ` [PATCH 16/27] scsi: consolidate opcode lookup in scsi_opcode_sa_name() Hannes Reinecke
2014-10-24 12:26 ` [PATCH 17/27] scsi: repurpose the last argument from print_opcode_name() Hannes Reinecke
2014-10-24 12:26 ` [PATCH 18/27] scsi: Remove scsi_print_command when calling abort Hannes Reinecke
2014-10-24 12:26 ` [PATCH 19/27] scsi: separate out scsi_(host|driver)byte_string() Hannes Reinecke
2014-10-24 12:27 ` [PATCH 20/27] Remove scsi_show_result() Hannes Reinecke
2014-10-24 12:27 ` [PATCH 21/27] scsi: simplify scsi_log_(send|completion) Hannes Reinecke
2014-10-24 12:27 ` [PATCH 22/27] scsi: fixup logging messages in scsi_error.c Hannes Reinecke
2014-10-24 12:27 ` [PATCH 23/27] scsi: use shost argument in scsi_eh_prt_fail_stats Hannes Reinecke
2014-10-24 12:27 ` [PATCH 24/27] scsi_error: document scsi_try_to_abort_cmd Hannes Reinecke
2014-10-24 12:27 ` [PATCH 25/27] scsi: check for correct return code in scsi_eh_abort_cmds() Hannes Reinecke
2014-10-28 19:04 ` Elliott, Robert (Server Storage)
2014-10-29 7:29 ` Hannes Reinecke
2014-10-24 12:27 ` [PATCH 26/27] scsi: correct return values for .eh_abort_handler implementations Hannes Reinecke
2014-10-28 23:49 ` Elliott, Robert (Server Storage)
2014-10-29 7:39 ` Hannes Reinecke
2014-10-24 12:27 ` [PATCH 27/27] scsi: ratelimit I/O error messages Hannes Reinecke
2014-10-24 21:00 ` Elliott, Robert (Server Storage)
2014-10-28 17:33 ` Christoph Hellwig
2014-10-28 17:44 ` Hannes Reinecke
2014-10-28 17:57 ` Christoph Hellwig
2014-10-28 18:36 ` Elliott, Robert (Server Storage)
2014-10-24 14:54 ` [PATCHv8 00/27] scsi logging update (the boring part) Christoph Hellwig
2014-10-28 2:23 ` Martin K. Petersen
-- strict thread matches above, loose matches on Subject: below --
2014-10-20 6:52 [PATCHv7 " Hannes Reinecke
2014-10-20 6:52 ` [PATCH 08/27] fas216: Update logging messages Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1414153627-2863-9-git-send-email-hare@suse.de \
--to=hare@suse.de \
--cc=elliott@hp.com \
--cc=hch@infradead.org \
--cc=jbottomley@parallels.com \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.