Merge tag 'nfs-for-3.3-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / megaraid.c

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index f2684dd09ed0d4e04d1fdba58f389bd113ef5148..15eefa1d61fd8dfbd25d696bb519a28570005454 100644 (file)
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -306,19 +306,22 @@ mega_query_adapter(adapter_t *adapter)
        adapter->host->sg_tablesize = adapter->sglen;
 
 
-       /* use HP firmware and bios version encoding */
+       /* use HP firmware and bios version encoding
+          Note: fw_version[0|1] and bios_version[0|1] were originally shifted
+          right 8 bits making them zero. This 0 value was hardcoded to fix
+          sparse warnings. */
        if (adapter->product_info.subsysvid == HP_SUBSYS_VID) {
                sprintf (adapter->fw_version, "%c%d%d.%d%d",
                         adapter->product_info.fw_version[2],
-                        adapter->product_info.fw_version[1] >> 8,
+                        0,
                         adapter->product_info.fw_version[1] & 0x0f,
-                        adapter->product_info.fw_version[0] >> 8,
+                        0,
                         adapter->product_info.fw_version[0] & 0x0f);
                sprintf (adapter->bios_version, "%c%d%d.%d%d",
                         adapter->product_info.bios_version[2],
-                        adapter->product_info.bios_version[1] >> 8,
+                        0,
                         adapter->product_info.bios_version[1] & 0x0f,
-                        adapter->product_info.bios_version[0] >> 8,
+                        0,
                         adapter->product_info.bios_version[0] & 0x0f);
        } else {
                memcpy(adapter->fw_version,
@@ -1469,8 +1472,8 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status)
                        if( scb->state & SCB_ABORT ) {
 
                                printk(KERN_WARNING
-                               "megaraid: aborted cmd %lx[%x] complete.\n",
-                                       scb->cmd->serial_number, scb->idx);
+                               "megaraid: aborted cmd [%x] complete.\n",
+                                       scb->idx);
 
                                scb->cmd->result = (DID_ABORT << 16);
 
@@ -1488,8 +1491,8 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status)
                        if( scb->state & SCB_RESET ) {
 
                                printk(KERN_WARNING
-                               "megaraid: reset cmd %lx[%x] complete.\n",
-                                       scb->cmd->serial_number, scb->idx);
+                               "megaraid: reset cmd [%x] complete.\n",
+                                       scb->idx);
 
                                scb->cmd->result = (DID_RESET << 16);
 
@@ -1958,8 +1961,8 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
        struct list_head        *pos, *next;
        scb_t                   *scb;
 
-       printk(KERN_WARNING "megaraid: %s-%lx cmd=%x <c=%d t=%d l=%d>\n",
-            (aor == SCB_ABORT)? "ABORTING":"RESET", cmd->serial_number,
+       printk(KERN_WARNING "megaraid: %s cmd=%x <c=%d t=%d l=%d>\n",
+            (aor == SCB_ABORT)? "ABORTING":"RESET",
             cmd->cmnd[0], cmd->device->channel, 
             cmd->device->id, cmd->device->lun);
 
@@ -1983,9 +1986,9 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
                        if( scb->state & SCB_ISSUED ) {
 
                                printk(KERN_WARNING
-                                       "megaraid: %s-%lx[%x], fw owner.\n",
+                                       "megaraid: %s[%x], fw owner.\n",
                                        (aor==SCB_ABORT) ? "ABORTING":"RESET",
-                                       cmd->serial_number, scb->idx);
+                                       scb->idx);
 
                                return FALSE;
                        }
@@ -1996,9 +1999,9 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
                                 * list
                                 */
                                printk(KERN_WARNING
-                                       "megaraid: %s-%lx[%x], driver owner.\n",
+                                       "megaraid: %s-[%x], driver owner.\n",
                                        (aor==SCB_ABORT) ? "ABORTING":"RESET",
-                                       cmd->serial_number, scb->idx);
+                                       scb->idx);
 
                                mega_free_scb(adapter, scb);