Re: [PATCH] drivers: message: fusion: Simplify rounding

[Joe Lawrence]

ALIGN is certainly more readable to me.

Reviewed-by: Joe Lawrence <joe.lawrence@xxxxxxxxxxx>

-- Joe

On Tue, 1 Jul 2014, Rasmus Villemoes wrote:

> 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@xxxxxxxxxxxxxxxxxx>
> ---
>  drivers/message/fusion/mptbase.c | 7 +------
>  drivers/message/fusion/mptctl.c  | 7 +------
>  2 files changed, 2 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
> index ebc0af7..10b16a1 100644
> --- a/drivers/message/fusion/mptbase.c
> +++ b/drivers/message/fusion/mptbase.c
> @@ -3175,12 +3175,7 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason)
>  			facts->FWImageSize = le32_to_cpu(facts->FWImageSize);
>  		}
>  
> -		sz = facts->FWImageSize;
> -		if ( sz & 0x01 )
> -			sz += 1;
> -		if ( sz & 0x02 )
> -			sz += 2;
> -		facts->FWImageSize = sz;
> +		facts->FWImageSize = ALIGN(facts->FWImageSize, 4);
>  
>  		if (!facts->RequestFrameSize) {
>  			/*  Something is wrong!  */
> diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
> index 8a050e8..1004392 100644
> --- a/drivers/message/fusion/mptctl.c
> +++ b/drivers/message/fusion/mptctl.c
> @@ -1749,12 +1749,7 @@ mptctl_replace_fw (unsigned long arg)
>  
>  	/* Allocate memory for the new FW image
>  	 */
> -	newFwSize = karg.newImageSize;
> -
> -	if (newFwSize & 0x01)
> -		newFwSize += 1;
> -	if (newFwSize & 0x02)
> -		newFwSize += 2;
> +	newFwSize = ALIGN(karg.newImageSize, 4);
>  
>  	mpt_alloc_fw_memory(ioc, newFwSize);
>  	if (ioc->cached_fw == NULL)
> -- 
> 1.9.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/