staging: ccree: fix checkpatch errors in macro def

Fix various checkpatch warnings and errors in LLI macro definitions

Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/ccree/cc_lli_defs.h b/drivers/staging/ccree/cc_lli_defs.h
index c84b14226dc95056ee6bb9ab2a0f792486067d34..857b94fc9c58510b19f8145f17b19b42b19f15aa 100644 (file)
--- a/drivers/staging/ccree/cc_lli_defs.h
+++ b/drivers/staging/ccree/cc_lli_defs.h
@@ -21,17 +21,29 @@
 
 #include "cc_bitops.h"
 
-/* Max DLLI size */
-#define DLLI_SIZE_BIT_SIZE     0x18    // DX_DSCRPTR_QUEUE_WORD1_DIN_SIZE_BIT_SIZE
+/* Max DLLI size
+ *  AKA DX_DSCRPTR_QUEUE_WORD1_DIN_SIZE_BIT_SIZE
+ */
+#define DLLI_SIZE_BIT_SIZE     0x18
 
 #define CC_MAX_MLLI_ENTRY_SIZE 0x10000
 
-#define LLI_SET_ADDR(lli_p, addr) \
-               BITFIELD_SET(((u32 *)(lli_p))[LLI_WORD0_OFFSET], LLI_LADDR_BIT_OFFSET, LLI_LADDR_BIT_SIZE, (addr & U32_MAX)); \
-               BITFIELD_SET(((u32 *)(lli_p))[LLI_WORD1_OFFSET], LLI_HADDR_BIT_OFFSET, LLI_HADDR_BIT_SIZE, MSB64(addr));
-
-#define LLI_SET_SIZE(lli_p, size) \
-               BITFIELD_SET(((u32 *)(lli_p))[LLI_WORD1_OFFSET], LLI_SIZE_BIT_OFFSET, LLI_SIZE_BIT_SIZE, size)
+#define LLI_SET_ADDR(__lli_p, __addr) do {                             \
+               u32 *lli_p = (u32 *)__lli_p;                            \
+               typeof(__addr) addr = __addr;                           \
+                                                                       \
+               BITFIELD_SET(lli_p[LLI_WORD0_OFFSET],                   \
+                       LLI_LADDR_BIT_OFFSET,                           \
+                       LLI_LADDR_BIT_SIZE, (addr & U32_MAX));          \
+                                                                       \
+               BITFIELD_SET(lli_p[LLI_WORD1_OFFSET],                   \
+                       LLI_HADDR_BIT_OFFSET,                           \
+                       LLI_HADDR_BIT_SIZE, MSB64(addr));               \
+       } while (0)
+
+#define LLI_SET_SIZE(lli_p, size)                                      \
+               BITFIELD_SET(((u32 *)(lli_p))[LLI_WORD1_OFFSET],        \
+               LLI_SIZE_BIT_OFFSET, LLI_SIZE_BIT_SIZE, size)
 
 /* Size of entry */
 #define LLI_ENTRY_WORD_SIZE 2