[SCSI] remove cmd->serial_number litter

[pandora-kernel.git] / drivers / scsi / megaraid / megaraid_sas_base.c

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index bbd10c8..89c623e 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -1698,7 +1698,7 @@ void megasas_do_ocr(struct megasas_instance *instance)
  * megasas_wait_for_outstanding -      Wait for all outstanding cmds
  * @instance:                          Adapter soft state
  *
- * This function waits for upto MEGASAS_RESET_WAIT_TIME seconds for FW to
+ * This function waits for up to MEGASAS_RESET_WAIT_TIME seconds for FW to
  * complete all its outstanding commands. Returns error if one or more IOs
  * are pending after this time period. It also marks the controller dead.
  */
@@ -1751,10 +1751,9 @@ static int megasas_wait_for_outstanding(struct megasas_instance *instance)
                        list_del_init(&reset_cmd->list);
                        if (reset_cmd->scmd) {
                                reset_cmd->scmd->result = DID_RESET << 16;
-                               printk(KERN_NOTICE "%d:%p reset [%02x], %#lx\n",
+                               printk(KERN_NOTICE "%d:%p reset [%02x]\n",
                                        reset_index, reset_cmd,
-                                       reset_cmd->scmd->cmnd[0],
-                                       reset_cmd->scmd->serial_number);
+                                       reset_cmd->scmd->cmnd[0]);
 
                                reset_cmd->scmd->scsi_done(reset_cmd->scmd);
                                megasas_return_cmd(instance, reset_cmd);
@@ -1879,8 +1878,8 @@ static int megasas_generic_reset(struct scsi_cmnd *scmd)
 
        instance = (struct megasas_instance *)scmd->device->host->hostdata;
 
-       scmd_printk(KERN_NOTICE, scmd, "megasas: RESET -%ld cmd=%x retries=%x\n",
-                scmd->serial_number, scmd->cmnd[0], scmd->retries);
+       scmd_printk(KERN_NOTICE, scmd, "megasas: RESET cmd=%x retries=%x\n",
+                scmd->cmnd[0], scmd->retries);
 
        if (instance->adprecovery == MEGASAS_HW_CRITICAL_ERROR) {
                printk(KERN_ERR "megasas: cannot recover from previous reset "
@@ -2349,9 +2348,9 @@ megasas_issue_pending_cmds_again(struct megasas_instance *instance)
                                                        cmd->frame_phys_addr ,
                                                        0, instance->reg_set);
                } else if (cmd->scmd) {
-                       printk(KERN_NOTICE "megasas: %p scsi cmd [%02x],%#lx"
+                       printk(KERN_NOTICE "megasas: %p scsi cmd [%02x]"
                        "detected on the internal queue, issue again.\n",
-                       cmd, cmd->scmd->cmnd[0], cmd->scmd->serial_number);
+                       cmd, cmd->scmd->cmnd[0]);
 
                        atomic_inc(&instance->fw_outstanding);
                        instance->instancet->fire_cmd(instance,