1 files changed, 35 insertions, 41 deletions

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 711fcb5cec87..0707fa2c701b 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -990,11 +990,10 @@ mptsas_queue_device_delete(MPT_ADAPTER *ioc,
         MpiEventDataSasDeviceStatusChange_t *sas_event_data)
 {
         struct fw_event_work *fw_event;
-        int sz;
 
-        sz = offsetof(struct fw_event_work, event_data) +
-            sizeof(MpiEventDataSasDeviceStatusChange_t);
-        fw_event = kzalloc(sz, GFP_ATOMIC);
+        fw_event = kzalloc(sizeof(*fw_event) +
+                           sizeof(MpiEventDataSasDeviceStatusChange_t),
+                           GFP_ATOMIC);
         if (!fw_event) {
                 printk(MYIOC_s_WARN_FMT "%s: failed at (line=%d)\n",
                     ioc->name, __func__, __LINE__);
@@ -1011,10 +1010,8 @@ static void
 mptsas_queue_rescan(MPT_ADAPTER *ioc)
 {
         struct fw_event_work *fw_event;
-        int sz;
 
-        sz = offsetof(struct fw_event_work, event_data);
-        fw_event = kzalloc(sz, GFP_ATOMIC);
+        fw_event = kzalloc(sizeof(*fw_event), GFP_ATOMIC);
         if (!fw_event) {
                 printk(MYIOC_s_WARN_FMT "%s: failed at (line=%d)\n",
                     ioc->name, __func__, __LINE__);
@@ -1206,27 +1203,28 @@ mptsas_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
             "(mf = %p, mr = %p)\n", ioc->name, mf, mr));
 
         pScsiTmReply = (SCSITaskMgmtReply_t *)mr;
-        if (pScsiTmReply) {
-                dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT
-                    "\tTaskMgmt completed: fw_channel = %d, fw_id = %d,\n"
-                    "\ttask_type = 0x%02X, iocstatus = 0x%04X "
-                    "loginfo = 0x%08X,\n\tresponse_code = 0x%02X, "
-                    "term_cmnds = %d\n", ioc->name,
-                    pScsiTmReply->Bus, pScsiTmReply->TargetID,
-                    pScsiTmReply->TaskType,
-                    le16_to_cpu(pScsiTmReply->IOCStatus),
-                    le32_to_cpu(pScsiTmReply->IOCLogInfo),
-                    pScsiTmReply->ResponseCode,
-                    le32_to_cpu(pScsiTmReply->TerminationCount)));
-
-                if (pScsiTmReply->ResponseCode)
-                        mptscsih_taskmgmt_response_code(ioc,
-                        pScsiTmReply->ResponseCode);
-        }
-
-        if (pScsiTmReply && (pScsiTmReply->TaskType ==
+        if (!pScsiTmReply)
+                return 0;
+
+        dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT
+            "\tTaskMgmt completed: fw_channel = %d, fw_id = %d,\n"
+            "\ttask_type = 0x%02X, iocstatus = 0x%04X "
+            "loginfo = 0x%08X,\n\tresponse_code = 0x%02X, "
+            "term_cmnds = %d\n", ioc->name,
+            pScsiTmReply->Bus, pScsiTmReply->TargetID,
+            pScsiTmReply->TaskType,
+            le16_to_cpu(pScsiTmReply->IOCStatus),
+            le32_to_cpu(pScsiTmReply->IOCLogInfo),
+            pScsiTmReply->ResponseCode,
+            le32_to_cpu(pScsiTmReply->TerminationCount)));
+
+        if (pScsiTmReply->ResponseCode)
+                mptscsih_taskmgmt_response_code(ioc,
+                pScsiTmReply->ResponseCode);
+
+        if (pScsiTmReply->TaskType ==
             MPI_SCSITASKMGMT_TASKTYPE_QUERY_TASK || pScsiTmReply->TaskType ==
-             MPI_SCSITASKMGMT_TASKTYPE_ABRT_TASK_SET)) {
+             MPI_SCSITASKMGMT_TASKTYPE_ABRT_TASK_SET) {
                 ioc->taskmgmt_cmds.status |= MPT_MGMT_STATUS_COMMAND_GOOD;
                 ioc->taskmgmt_cmds.status |= MPT_MGMT_STATUS_RF_VALID;
                 memcpy(ioc->taskmgmt_cmds.reply, mr,
@@ -1575,7 +1573,7 @@ mptsas_del_end_device(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info)
         mptsas_port_delete(ioc, phy_info->port_details);
 }
 
-struct mptsas_phyinfo *
+static struct mptsas_phyinfo *
 mptsas_refreshing_device_handles(MPT_ADAPTER *ioc,
         struct mptsas_devinfo *sas_device)
 {
@@ -3648,7 +3646,7 @@ mptsas_send_expander_event(struct fw_event_work *fw_event)
  * @handle:
  *
  */
-struct mptsas_portinfo *
+static struct mptsas_portinfo *
 mptsas_expander_add(MPT_ADAPTER *ioc, u16 handle)
 {
         struct mptsas_portinfo buffer, *port_info;
@@ -3763,7 +3761,7 @@ mptsas_send_link_status_event(struct fw_event_work *fw_event)
                                                 printk(MYIOC_s_DEBUG_FMT
                                                 "SDEV OUTSTANDING CMDS"
                                                 "%d\n", ioc->name,
-                                                sdev->device_busy));
+                                                atomic_read(&sdev->device_busy)));
                                 }
 
                         }
@@ -3856,10 +3854,8 @@ retry_page:
                         phy_info = mptsas_find_phyinfo_by_sas_address(ioc,
                                         sas_info->sas_address);
 
-                        if (phy_info) {
-                                mptsas_del_end_device(ioc, phy_info);
-                                goto redo_device_scan;
-                        }
+                        mptsas_del_end_device(ioc, phy_info);
+                        goto redo_device_scan;
                 } else
                         mptsas_volume_delete(ioc, sas_info->fw.id);
         }
@@ -3870,9 +3866,8 @@ retry_page:
  redo_expander_scan:
         list_for_each_entry(port_info, &ioc->sas_topology, list) {
 
-                if (port_info->phy_info &&
-                    (!(port_info->phy_info[0].identify.device_info &
-                    MPI_SAS_DEVICE_INFO_SMP_TARGET)))
+                if (!(port_info->phy_info[0].identify.device_info &
+                    MPI_SAS_DEVICE_INFO_SMP_TARGET))
                         continue;
                 found_expander = 0;
                 handle = 0xFFFF;
@@ -4983,7 +4978,7 @@ static int
 mptsas_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *reply)
 {
         u32 event = le32_to_cpu(reply->Event);
-        int sz, event_data_sz;
+        int event_data_sz;
         struct fw_event_work *fw_event;
         unsigned long delay;
 
@@ -5093,8 +5088,7 @@ mptsas_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *reply)
 
         event_data_sz = ((reply->MsgLength * 4) -
             offsetof(EventNotificationReply_t, Data));
-        sz = offsetof(struct fw_event_work, event_data) + event_data_sz;
-        fw_event = kzalloc(sz, GFP_ATOMIC);
+        fw_event = kzalloc(sizeof(*fw_event) + event_data_sz, GFP_ATOMIC);
         if (!fw_event) {
                 printk(MYIOC_s_WARN_FMT "%s: failed at (line=%d)\n", ioc->name,
                  __func__, __LINE__);
@@ -5321,7 +5315,7 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         return error;
 }
 
-void
+static void
 mptsas_shutdown(struct pci_dev *pdev)
 {
         MPT_ADAPTER *ioc = pci_get_drvdata(pdev);