1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index d6a0074b9dc3..c4e8b9aa3827 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -952,7 +952,6 @@ mpt_put_msg_frame_hi_pri(u8 cb_idx, MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf)
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *      mpt_free_msg_frame - Place MPT request frame back on FreeQ.
- *      @handle: Handle of registered MPT protocol driver
  *      @ioc: Pointer to MPT adapter structure
  *      @mf: Pointer to MPT request frame
  *
@@ -4563,7 +4562,7 @@ WaitForDoorbellReply(MPT_ADAPTER *ioc, int howlong, int sleepFlag)
                         failcnt++;
                 hword = le16_to_cpu(CHIPREG_READ32(&ioc->chip->Doorbell) & 0x0000FFFF);
                 /* don't overflow our IOC hs_reply[] buffer! */
-                if (u16cnt < sizeof(ioc->hs_reply) / sizeof(ioc->hs_reply[0]))
+                if (u16cnt < ARRAY_SIZE(ioc->hs_reply))
                         hs_reply[u16cnt] = hword;
                 CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
         }
@@ -5422,7 +5421,6 @@ mpt_raid_phys_disk_pg0(MPT_ADAPTER *ioc, u8 phys_disk_num, pRaidPhysDiskPage0_t
 /**
  *      mpt_findImVolumes - Identify IDs of hidden disks and RAID Volumes
  *      @ioc: Pointer to a Adapter Strucutre
- *      @portnum: IOC port number
  *
  *      Return:
  *      0 on success
@@ -6939,7 +6937,6 @@ mpt_fc_log_info(MPT_ADAPTER *ioc, u32 log_info)
 /**
  *      mpt_spi_log_info - Log information returned from SCSI Parallel IOC.
  *      @ioc: Pointer to MPT_ADAPTER structure
- *      @mr: Pointer to MPT reply frame
  *      @log_info: U32 LogInfo word from the IOC
  *
  *      Refer to lsi/sp_log.h.
@@ -7176,7 +7173,7 @@ union loginfo_type {
 
         sas_loginfo.loginfo = log_info;
         if ((sas_loginfo.dw.bus_type != 3 /*SAS*/) &&
-            (sas_loginfo.dw.originator < sizeof(originator_str)/sizeof(char*)))
+            (sas_loginfo.dw.originator < ARRAY_SIZE(originator_str)))
                 return;
 
         originator_desc = originator_str[sas_loginfo.dw.originator];
@@ -7185,21 +7182,21 @@ union loginfo_type {
 
                 case 0:  /* IOP */
                         if (sas_loginfo.dw.code <
-                            sizeof(iop_code_str)/sizeof(char*))
+                            ARRAY_SIZE(iop_code_str))
                                 code_desc = iop_code_str[sas_loginfo.dw.code];
                         break;
                 case 1:  /* PL */
                         if (sas_loginfo.dw.code <
-                            sizeof(pl_code_str)/sizeof(char*))
+                            ARRAY_SIZE(pl_code_str))
                                 code_desc = pl_code_str[sas_loginfo.dw.code];
                         break;
                 case 2:  /* IR */
                         if (sas_loginfo.dw.code >=
-                            sizeof(ir_code_str)/sizeof(char*))
+                            ARRAY_SIZE(ir_code_str))
                                 break;
                         code_desc = ir_code_str[sas_loginfo.dw.code];
                         if (sas_loginfo.dw.subcode >=
-                            sizeof(raid_sub_code_str)/sizeof(char*))
+                            ARRAY_SIZE(raid_sub_code_str))
                         break;
                         if (sas_loginfo.dw.code == 0)
                                 sub_code_desc =