From 5dada6227b949ef702bfab7986bc083689afdaf7 Mon Sep 17 00:00:00 2001 From: Abhyuday Godhasara Date: Thu, 5 Aug 2021 10:49:23 -0700 Subject: [PATCH] fix(plat/xilinx/versal): resolve misra R20.7 in pm services MISRA Violation: MISRA-C:2012 R.20.7 - Expressions resulting from the expansion of macro parameters shall be enclosed in parentheses Signed-off-by: Abhyuday Godhasara Change-Id: Id913c556cab955c798809ad2bd08ca3e48e2231a --- plat/xilinx/versal/pm_service/pm_api_sys.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plat/xilinx/versal/pm_service/pm_api_sys.c b/plat/xilinx/versal/pm_service/pm_api_sys.c index f67b3e85c..7cc22679e 100644 --- a/plat/xilinx/versal/pm_service/pm_api_sys.c +++ b/plat/xilinx/versal/pm_service/pm_api_sys.c @@ -42,32 +42,32 @@ unsigned int pm_get_shutdown_scope(void) * Assigning of argument values into array elements. */ #define PM_PACK_PAYLOAD1(pl, mid, flag, arg0) { \ - pl[0] = (uint32_t)((uint32_t)((arg0) & 0xFFU) | (mid << 8U) | ((flag) << 24U)); \ + pl[0] = (uint32_t)(((uint32_t)(arg0) & 0xFFU) | ((mid) << 8U) | ((flag) << 24U)); \ } #define PM_PACK_PAYLOAD2(pl, mid, flag, arg0, arg1) { \ pl[1] = (uint32_t)(arg1); \ - PM_PACK_PAYLOAD1(pl, mid, flag, arg0); \ + PM_PACK_PAYLOAD1(pl, (mid), (flag), (arg0)); \ } #define PM_PACK_PAYLOAD3(pl, mid, flag, arg0, arg1, arg2) { \ pl[2] = (uint32_t)(arg2); \ - PM_PACK_PAYLOAD2(pl, mid, flag, arg0, arg1); \ + PM_PACK_PAYLOAD2(pl, (mid), (flag), (arg0), (arg1)); \ } #define PM_PACK_PAYLOAD4(pl, mid, flag, arg0, arg1, arg2, arg3) { \ pl[3] = (uint32_t)(arg3); \ - PM_PACK_PAYLOAD3(pl, mid, flag, arg0, arg1, arg2); \ + PM_PACK_PAYLOAD3(pl, (mid), (flag), (arg0), (arg1), (arg2)); \ } #define PM_PACK_PAYLOAD5(pl, mid, flag, arg0, arg1, arg2, arg3, arg4) { \ pl[4] = (uint32_t)(arg4); \ - PM_PACK_PAYLOAD4(pl, mid, flag, arg0, arg1, arg2, arg3); \ + PM_PACK_PAYLOAD4(pl, (mid), (flag), (arg0), (arg1), (arg2), (arg3)); \ } #define PM_PACK_PAYLOAD6(pl, mid, flag, arg0, arg1, arg2, arg3, arg4, arg5) { \ pl[5] = (uint32_t)(arg5); \ - PM_PACK_PAYLOAD5(pl, mid, flag, arg0, arg1, arg2, arg3, arg4); \ + PM_PACK_PAYLOAD5(pl, (mid), (flag), (arg0), (arg1), (arg2), (arg3), (arg4)); \ } /* PM API functions */