leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mptfusion: simplify rounding

Browse Source 
Rounding up to a multiple of 4 should be done using the ALIGN
macro. As a bonus, this also makes the generated code smaller.

In GetIocFacts(), sz is assigned to a few lines below without being
read in the meantime, so it is ok that it doesn't end up with the same
value as facts->FWImageSize.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: Joe Lawrence <joe.lawrence@stratus.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Rasmus Villemoes 2014-07-01 14:56:20 +02:00 committed by Christoph Hellwig
parent 84e32a06f4
commit f6e495a2b3
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/message/fusion/mptbase.c
View File

@ -3172,12 +3172,7 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason)
facts->FWImageSize = le32_to_cpu(facts->FWImageSize); facts->FWImageSize = le32_to_cpu(facts->FWImageSize);
} }
sz = facts->FWImageSize; facts->FWImageSize = ALIGN(facts->FWImageSize, 4);
if ( sz & 0x01 )
sz += 1;
if ( sz & 0x02 )
sz += 2;
facts->FWImageSize = sz;
if (!facts->RequestFrameSize) { if (!facts->RequestFrameSize) {
/* Something is wrong! */ /* Something is wrong! */

7
drivers/message/fusion/mptctl.c
View File

@ -1741,12 +1741,7 @@ mptctl_replace_fw (unsigned long arg)
/* Allocate memory for the new FW image /* Allocate memory for the new FW image
*/ */
newFwSize = karg.newImageSize; newFwSize = ALIGN(karg.newImageSize, 4);
if (newFwSize & 0x01)
newFwSize += 1;
if (newFwSize & 0x02)
newFwSize += 2;
mpt_alloc_fw_memory(ioc, newFwSize); mpt_alloc_fw_memory(ioc, newFwSize);
if (ioc->cached_fw == NULL) if (ioc->cached_fw == NULL)