diff options
author | Christoph Hellwig <hch@infradead.org> | 2011-04-04 09:42:14 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2011-05-01 11:22:40 -0400 |
commit | 5cd049a59913f359e7d30c11d2dc6187822e77b1 (patch) | |
tree | f1406a16f6f0b786857e4433467d7ad762e45186 /drivers/scsi/megaraid/megaraid_sas_base.c | |
parent | f04ca1b65480df9ecbaaa797e62b063387429410 (diff) |
[SCSI] remove cmd->serial_number litter
Stop using cmd->serial_number in printks.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas_base.c')
-rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 66d4cea4df98..89c623ebadbc 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c | |||
@@ -1751,10 +1751,9 @@ static int megasas_wait_for_outstanding(struct megasas_instance *instance) | |||
1751 | list_del_init(&reset_cmd->list); | 1751 | list_del_init(&reset_cmd->list); |
1752 | if (reset_cmd->scmd) { | 1752 | if (reset_cmd->scmd) { |
1753 | reset_cmd->scmd->result = DID_RESET << 16; | 1753 | reset_cmd->scmd->result = DID_RESET << 16; |
1754 | printk(KERN_NOTICE "%d:%p reset [%02x], %#lx\n", | 1754 | printk(KERN_NOTICE "%d:%p reset [%02x]\n", |
1755 | reset_index, reset_cmd, | 1755 | reset_index, reset_cmd, |
1756 | reset_cmd->scmd->cmnd[0], | 1756 | reset_cmd->scmd->cmnd[0]); |
1757 | reset_cmd->scmd->serial_number); | ||
1758 | 1757 | ||
1759 | reset_cmd->scmd->scsi_done(reset_cmd->scmd); | 1758 | reset_cmd->scmd->scsi_done(reset_cmd->scmd); |
1760 | megasas_return_cmd(instance, reset_cmd); | 1759 | megasas_return_cmd(instance, reset_cmd); |
@@ -1879,8 +1878,8 @@ static int megasas_generic_reset(struct scsi_cmnd *scmd) | |||
1879 | 1878 | ||
1880 | instance = (struct megasas_instance *)scmd->device->host->hostdata; | 1879 | instance = (struct megasas_instance *)scmd->device->host->hostdata; |
1881 | 1880 | ||
1882 | scmd_printk(KERN_NOTICE, scmd, "megasas: RESET -%ld cmd=%x retries=%x\n", | 1881 | scmd_printk(KERN_NOTICE, scmd, "megasas: RESET cmd=%x retries=%x\n", |
1883 | scmd->serial_number, scmd->cmnd[0], scmd->retries); | 1882 | scmd->cmnd[0], scmd->retries); |
1884 | 1883 | ||
1885 | if (instance->adprecovery == MEGASAS_HW_CRITICAL_ERROR) { | 1884 | if (instance->adprecovery == MEGASAS_HW_CRITICAL_ERROR) { |
1886 | printk(KERN_ERR "megasas: cannot recover from previous reset " | 1885 | printk(KERN_ERR "megasas: cannot recover from previous reset " |
@@ -2349,9 +2348,9 @@ megasas_issue_pending_cmds_again(struct megasas_instance *instance) | |||
2349 | cmd->frame_phys_addr , | 2348 | cmd->frame_phys_addr , |
2350 | 0, instance->reg_set); | 2349 | 0, instance->reg_set); |
2351 | } else if (cmd->scmd) { | 2350 | } else if (cmd->scmd) { |
2352 | printk(KERN_NOTICE "megasas: %p scsi cmd [%02x],%#lx" | 2351 | printk(KERN_NOTICE "megasas: %p scsi cmd [%02x]" |
2353 | "detected on the internal queue, issue again.\n", | 2352 | "detected on the internal queue, issue again.\n", |
2354 | cmd, cmd->scmd->cmnd[0], cmd->scmd->serial_number); | 2353 | cmd, cmd->scmd->cmnd[0]); |
2355 | 2354 | ||
2356 | atomic_inc(&instance->fw_outstanding); | 2355 | atomic_inc(&instance->fw_outstanding); |
2357 | instance->instancet->fire_cmd(instance, | 2356 | instance->instancet->fire_cmd(instance, |