[PATCH] staging: lustre: obdclass: fix macro coding style issue in uuid.c

Vasiliy Korchagin vasiliy.korchagin at gmail.com
Sat Jun 27 05:36:05 UTC 2015


This patch fixes the checkpatch.pl error:

ERROR: Macros with complex values should be enclosed in parentheses
+#define CONSUME(val, ptr) (val) = consume(sizeof(val), (ptr))

by expanding it as this macro is used only once.

Signed-off-by: Vasiliy Korchagin <vasiliy.korchagin at gmail.com>
---

Notes:
    Here is another version with macro expansion. Inline function expansion doesn't
    seem like a good idea to me as it would make things overcomplicated.

 drivers/staging/lustre/lustre/obdclass/uuid.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/uuid.c b/drivers/staging/lustre/lustre/obdclass/uuid.c
index ff0a01b..d121c5c 100644
--- a/drivers/staging/lustre/lustre/obdclass/uuid.c
+++ b/drivers/staging/lustre/lustre/obdclass/uuid.c
@@ -55,8 +55,6 @@ static inline __u32 consume(int nob, __u8 **ptr)
 	return value;
 }
 
-#define CONSUME(val, ptr) (val) = consume(sizeof(val), (ptr))
-
 static void uuid_unpack(class_uuid_t in, __u16 *uu, int nr)
 {
 	__u8 *ptr = in;
@@ -64,7 +62,7 @@ static void uuid_unpack(class_uuid_t in, __u16 *uu, int nr)
 	LASSERT(nr * sizeof(*uu) == sizeof(class_uuid_t));
 
 	while (nr-- > 0)
-		CONSUME(uu[nr], &ptr);
+		uu[nr] = consume(sizeof(uu[nr]), &ptr);
 }
 
 void class_uuid_unparse(class_uuid_t uu, struct obd_uuid *out)
-- 
2.4.4



More information about the devel mailing list