Commit 525dd8a3 authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman
Browse files

staging: vchiq_core: avoid precedence issues 



Add () around macro argument to avoid precedence issues

Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1622735405-9980-8-git-send-email-stefan.wahren@i2se.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9d5f721f

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

+7 −7
Original line number Diff line number Diff line
@@ -35,14 +35,14 @@ 


#define VCHIQ_PORT_MAX                 (VCHIQ_MAX_SERVICES - 1)

#define VCHIQ_PORT_FREE                0x1000

#define VCHIQ_PORT_IS_VALID(port)      (port < VCHIQ_PORT_FREE)

#define VCHIQ_PORT_IS_VALID(port)      ((port) < VCHIQ_PORT_FREE)

#define VCHIQ_MAKE_MSG(type, srcport, dstport) \

	((type << 24) | (srcport << 12) | (dstport << 0))

#define VCHIQ_MSG_TYPE(msgid)          ((unsigned int)msgid >> 24)

	(((type) << 24) | ((srcport) << 12) | ((dstport) << 0))

#define VCHIQ_MSG_TYPE(msgid)          ((unsigned int)(msgid) >> 24)

#define VCHIQ_MSG_SRCPORT(msgid) \

	(unsigned short)(((unsigned int)msgid >> 12) & 0xfff)

	(unsigned short)(((unsigned int)(msgid) >> 12) & 0xfff)

#define VCHIQ_MSG_DSTPORT(msgid) \

	((unsigned short)msgid & 0xfff)

	((unsigned short)(msgid) & 0xfff)



/* Ensure the fields are wide enough */

static_assert(VCHIQ_MSG_SRCPORT(VCHIQ_MAKE_MSG(0, 0, VCHIQ_PORT_MAX))
@@ -55,7 +55,7 @@ static_assert((unsigned int)VCHIQ_PORT_MAX < 
#define VCHIQ_MSGID_CLAIMED            0x40000000



#define VCHIQ_FOURCC_INVALID           0x00000000

#define VCHIQ_FOURCC_IS_LEGAL(fourcc)  (fourcc != VCHIQ_FOURCC_INVALID)

#define VCHIQ_FOURCC_IS_LEGAL(fourcc)  ((fourcc) != VCHIQ_FOURCC_INVALID)



#define VCHIQ_BULK_ACTUAL_ABORTED -1
@@ -84,7 +84,7 @@ static_assert((unsigned int)VCHIQ_PORT_MAX < 
#define SLOT_QUEUE_INDEX_FROM_POS_MASKED(pos) \

	(SLOT_QUEUE_INDEX_FROM_POS(pos) & VCHIQ_SLOT_QUEUE_MASK)



#define BULK_INDEX(x) (x & (VCHIQ_NUM_SERVICE_BULKS - 1))

#define BULK_INDEX(x) ((x) & (VCHIQ_NUM_SERVICE_BULKS - 1))



#define SRVTRACE_LEVEL(srv) \

	(((srv) && (srv)->trace) ? VCHIQ_LOG_TRACE : vchiq_core_msg_log_level)