[SCSI] fusion: use ARRAY_SIZE
ARRAY_SIZE is more concise to use when the size of an array is divided by the size of its type or the size of its first element. Signed-off-by: Julia Lawall <julia@diku.dk> Acked-by: "Prakash, Sathya" <Sathya.Prakash@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
committed by
James Bottomley
parent
ef661c5e8f
commit
dd7c34e9a2
@@ -4562,7 +4562,7 @@ WaitForDoorbellReply(MPT_ADAPTER *ioc, int howlong, int sleepFlag)
|
|||||||
failcnt++;
|
failcnt++;
|
||||||
hword = le16_to_cpu(CHIPREG_READ32(&ioc->chip->Doorbell) & 0x0000FFFF);
|
hword = le16_to_cpu(CHIPREG_READ32(&ioc->chip->Doorbell) & 0x0000FFFF);
|
||||||
/* don't overflow our IOC hs_reply[] buffer! */
|
/* 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;
|
hs_reply[u16cnt] = hword;
|
||||||
CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
|
CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
|
||||||
}
|
}
|
||||||
@@ -7173,7 +7173,7 @@ union loginfo_type {
|
|||||||
|
|
||||||
sas_loginfo.loginfo = log_info;
|
sas_loginfo.loginfo = log_info;
|
||||||
if ((sas_loginfo.dw.bus_type != 3 /*SAS*/) &&
|
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;
|
return;
|
||||||
|
|
||||||
originator_desc = originator_str[sas_loginfo.dw.originator];
|
originator_desc = originator_str[sas_loginfo.dw.originator];
|
||||||
@@ -7182,21 +7182,21 @@ union loginfo_type {
|
|||||||
|
|
||||||
case 0: /* IOP */
|
case 0: /* IOP */
|
||||||
if (sas_loginfo.dw.code <
|
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];
|
code_desc = iop_code_str[sas_loginfo.dw.code];
|
||||||
break;
|
break;
|
||||||
case 1: /* PL */
|
case 1: /* PL */
|
||||||
if (sas_loginfo.dw.code <
|
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];
|
code_desc = pl_code_str[sas_loginfo.dw.code];
|
||||||
break;
|
break;
|
||||||
case 2: /* IR */
|
case 2: /* IR */
|
||||||
if (sas_loginfo.dw.code >=
|
if (sas_loginfo.dw.code >=
|
||||||
sizeof(ir_code_str)/sizeof(char*))
|
ARRAY_SIZE(ir_code_str))
|
||||||
break;
|
break;
|
||||||
code_desc = ir_code_str[sas_loginfo.dw.code];
|
code_desc = ir_code_str[sas_loginfo.dw.code];
|
||||||
if (sas_loginfo.dw.subcode >=
|
if (sas_loginfo.dw.subcode >=
|
||||||
sizeof(raid_sub_code_str)/sizeof(char*))
|
ARRAY_SIZE(raid_sub_code_str))
|
||||||
break;
|
break;
|
||||||
if (sas_loginfo.dw.code == 0)
|
if (sas_loginfo.dw.code == 0)
|
||||||
sub_code_desc =
|
sub_code_desc =
|
||||||
|
Reference in New Issue
Block a user