From: Mischa Jonker Date: Fri, 26 Jul 2013 14:18:41 +0000 (+0200) Subject: Add parentheses to ALLOC_ALIGN_BUFFER macro's X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=e8232fea41be712bfe894abbff08c39015d8d5d2;p=u-boot.git Add parentheses to ALLOC_ALIGN_BUFFER macro's Without those it's very easy to make mistakes when for instance the 'size' field is more than just a constant. Signed-off-by: Mischa Jonker Cc: Alexey Brodkin Cc: Marek Vasut Cc: Anton Staaf Cc: Tom Rini Cc: Wolfgang Denk --- diff --git a/include/common.h b/include/common.h index 8addf43343..cc7454a0d4 100644 --- a/include/common.h +++ b/include/common.h @@ -1015,10 +1015,10 @@ static inline phys_addr_t map_to_sysmem(void *ptr) * of a function scoped static buffer. It can not be used to create a cache * line aligned global buffer. */ -#define PAD_COUNT(s, pad) ((s - 1) / pad + 1) +#define PAD_COUNT(s, pad) (((s) - 1) / (pad) + 1) #define PAD_SIZE(s, pad) (PAD_COUNT(s, pad) * pad) #define ALLOC_ALIGN_BUFFER_PAD(type, name, size, align, pad) \ - char __##name[ROUND(PAD_SIZE(size * sizeof(type), pad), align) \ + char __##name[ROUND(PAD_SIZE((size) * sizeof(type), pad), align) \ + (align - 1)]; \ \ type *name = (type *) ALIGN((uintptr_t)__##name, align)