|
@@ -4562,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);
|
|
|
}
|
|
@@ -7173,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];
|
|
@@ -7182,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 =
|