[SCSI] remove cmd->serial_number litter

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

diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 1dba328..2e6619e 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -2315,8 +2315,8 @@ megaraid_mbox_dpc(unsigned long devp)
                // Was an abort issued for this command earlier
                if (scb->state & SCB_ABORT) {
                        con_log(CL_ANN, (KERN_NOTICE
-                       "megaraid: aborted cmd %lx[%x] completed\n",
-                               scp->serial_number, scb->sno));
+                       "megaraid: aborted cmd [%x] completed\n",
+                               scb->sno));
                }
 
                /*
@@ -2472,8 +2472,8 @@ megaraid_abort_handler(struct scsi_cmnd *scp)
        raid_dev        = ADAP2RAIDDEV(adapter);
 
        con_log(CL_ANN, (KERN_WARNING
-               "megaraid: aborting-%ld cmd=%x <c=%d t=%d l=%d>\n",
-               scp->serial_number, scp->cmnd[0], SCP2CHANNEL(scp),
+               "megaraid: aborting cmd=%x <c=%d t=%d l=%d>\n",
+               scp->cmnd[0], SCP2CHANNEL(scp),
                SCP2TARGET(scp), SCP2LUN(scp)));
 
        // If FW has stopped responding, simply return failure
@@ -2496,9 +2496,8 @@ megaraid_abort_handler(struct scsi_cmnd *scp)
                        list_del_init(&scb->list);      // from completed list
 
                        con_log(CL_ANN, (KERN_WARNING
-                       "megaraid: %ld:%d[%d:%d], abort from completed list\n",
-                               scp->serial_number, scb->sno,
-                               scb->dev_channel, scb->dev_target));
+                       "megaraid: %d[%d:%d], abort from completed list\n",
+                               scb->sno, scb->dev_channel, scb->dev_target));
 
                        scp->result = (DID_ABORT << 16);
                        scp->scsi_done(scp);
@@ -2527,9 +2526,8 @@ megaraid_abort_handler(struct scsi_cmnd *scp)
                        ASSERT(!(scb->state & SCB_ISSUED));
 
                        con_log(CL_ANN, (KERN_WARNING
-                               "megaraid abort: %ld[%d:%d], driver owner\n",
-                               scp->serial_number, scb->dev_channel,
-                               scb->dev_target));
+                               "megaraid abort: [%d:%d], driver owner\n",
+                               scb->dev_channel, scb->dev_target));
 
                        scp->result = (DID_ABORT << 16);
                        scp->scsi_done(scp);
@@ -2560,25 +2558,21 @@ megaraid_abort_handler(struct scsi_cmnd *scp)
 
                        if (!(scb->state & SCB_ISSUED)) {
                                con_log(CL_ANN, (KERN_WARNING
-                               "megaraid abort: %ld%d[%d:%d], invalid state\n",
-                               scp->serial_number, scb->sno, scb->dev_channel,
-                               scb->dev_target));
+                               "megaraid abort: %d[%d:%d], invalid state\n",
+                               scb->sno, scb->dev_channel, scb->dev_target));
                                BUG();
                        }
                        else {
                                con_log(CL_ANN, (KERN_WARNING
-                               "megaraid abort: %ld:%d[%d:%d], fw owner\n",
-                               scp->serial_number, scb->sno, scb->dev_channel,
-                               scb->dev_target));
+                               "megaraid abort: %d[%d:%d], fw owner\n",
+                               scb->sno, scb->dev_channel, scb->dev_target));
                        }
                }
        }
        spin_unlock_irq(&adapter->lock);
 
        if (!found) {
-               con_log(CL_ANN, (KERN_WARNING
-                       "megaraid abort: scsi cmd:%ld, do now own\n",
-                       scp->serial_number));
+               con_log(CL_ANN, (KERN_WARNING "megaraid abort: do now own\n"));
 
                // FIXME: Should there be a callback for this command?
                return SUCCESS;
@@ -2649,9 +2643,8 @@ megaraid_reset_handler(struct scsi_cmnd *scp)
                } else {
                        if (scb->scp == scp) {  // Found command
                                con_log(CL_ANN, (KERN_WARNING
-                                       "megaraid: %ld:%d[%d:%d], reset from pending list\n",
-                                       scp->serial_number, scb->sno,
-                                       scb->dev_channel, scb->dev_target));
+                                       "megaraid: %d[%d:%d], reset from pending list\n",
+                                       scb->sno, scb->dev_channel, scb->dev_target));
                        } else {
                                con_log(CL_ANN, (KERN_WARNING
                                "megaraid: IO packet with %d[%d:%d] being reset\n",