diff options
author | Julia Lawall <julia@diku.dk> | 2008-11-09 11:55:27 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-12-29 12:24:17 -0500 |
commit | dd7c34e9a27be521d480e5b84c84e92de2ea7b95 (patch) | |
tree | 8351cf4e7542f44bbb848521d74628ac4ad1922b | |
parent | ef661c5e8f2b6846f6d2dab98b5bffdefbfce477 (diff) |
[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>
-rw-r--r-- | drivers/message/fusion/mptbase.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index f8ef7242259e..c4e8b9aa3827 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -4562,7 +4562,7 @@ WaitForDoorbellReply(MPT_ADAPTER *ioc, int howlong, int sleepFlag) | |||
4562 | failcnt++; | 4562 | failcnt++; |
4563 | hword = le16_to_cpu(CHIPREG_READ32(&ioc->chip->Doorbell) & 0x0000FFFF); | 4563 | hword = le16_to_cpu(CHIPREG_READ32(&ioc->chip->Doorbell) & 0x0000FFFF); |
4564 | /* don't overflow our IOC hs_reply[] buffer! */ | 4564 | /* don't overflow our IOC hs_reply[] buffer! */ |
4565 | if (u16cnt < sizeof(ioc->hs_reply) / sizeof(ioc->hs_reply[0])) | 4565 | if (u16cnt < ARRAY_SIZE(ioc->hs_reply)) |
4566 | hs_reply[u16cnt] = hword; | 4566 | hs_reply[u16cnt] = hword; |
4567 | CHIPREG_WRITE32(&ioc->chip->IntStatus, 0); | 4567 | CHIPREG_WRITE32(&ioc->chip->IntStatus, 0); |
4568 | } | 4568 | } |
@@ -7173,7 +7173,7 @@ union loginfo_type { | |||
7173 | 7173 | ||
7174 | sas_loginfo.loginfo = log_info; | 7174 | sas_loginfo.loginfo = log_info; |
7175 | if ((sas_loginfo.dw.bus_type != 3 /*SAS*/) && | 7175 | if ((sas_loginfo.dw.bus_type != 3 /*SAS*/) && |
7176 | (sas_loginfo.dw.originator < sizeof(originator_str)/sizeof(char*))) | 7176 | (sas_loginfo.dw.originator < ARRAY_SIZE(originator_str))) |
7177 | return; | 7177 | return; |
7178 | 7178 | ||
7179 | originator_desc = originator_str[sas_loginfo.dw.originator]; | 7179 | originator_desc = originator_str[sas_loginfo.dw.originator]; |
@@ -7182,21 +7182,21 @@ union loginfo_type { | |||
7182 | 7182 | ||
7183 | case 0: /* IOP */ | 7183 | case 0: /* IOP */ |
7184 | if (sas_loginfo.dw.code < | 7184 | if (sas_loginfo.dw.code < |
7185 | sizeof(iop_code_str)/sizeof(char*)) | 7185 | ARRAY_SIZE(iop_code_str)) |
7186 | code_desc = iop_code_str[sas_loginfo.dw.code]; | 7186 | code_desc = iop_code_str[sas_loginfo.dw.code]; |
7187 | break; | 7187 | break; |
7188 | case 1: /* PL */ | 7188 | case 1: /* PL */ |
7189 | if (sas_loginfo.dw.code < | 7189 | if (sas_loginfo.dw.code < |
7190 | sizeof(pl_code_str)/sizeof(char*)) | 7190 | ARRAY_SIZE(pl_code_str)) |
7191 | code_desc = pl_code_str[sas_loginfo.dw.code]; | 7191 | code_desc = pl_code_str[sas_loginfo.dw.code]; |
7192 | break; | 7192 | break; |
7193 | case 2: /* IR */ | 7193 | case 2: /* IR */ |
7194 | if (sas_loginfo.dw.code >= | 7194 | if (sas_loginfo.dw.code >= |
7195 | sizeof(ir_code_str)/sizeof(char*)) | 7195 | ARRAY_SIZE(ir_code_str)) |
7196 | break; | 7196 | break; |
7197 | code_desc = ir_code_str[sas_loginfo.dw.code]; | 7197 | code_desc = ir_code_str[sas_loginfo.dw.code]; |
7198 | if (sas_loginfo.dw.subcode >= | 7198 | if (sas_loginfo.dw.subcode >= |
7199 | sizeof(raid_sub_code_str)/sizeof(char*)) | 7199 | ARRAY_SIZE(raid_sub_code_str)) |
7200 | break; | 7200 | break; |
7201 | if (sas_loginfo.dw.code == 0) | 7201 | if (sas_loginfo.dw.code == 0) |
7202 | sub_code_desc = | 7202 | sub_code_desc = |