From 6d83f6bca8dd4fca6677102251c20b5df278e8b1 Mon Sep 17 00:00:00 2001 From: ajesh Date: Mon, 6 May 2019 11:59:01 +0530 Subject: [PATCH] gpu: nvgpu: fix MISRA violation in posix cond unit MISRA 20.7 rule requires macro paramaters to be wrapped in parantheses when the parameter expands into an expression. Fix the violation of MISRA rule 20.7 in posix cond unit. Jira NVGPU-3139 Change-Id: If1833677b5c6e3d9f3f20ff81fdc4c6dd52451b9 Signed-off-by: ajesh Reviewed-on: https://git-master.nvidia.com/r/2112615 Reviewed-by: Philip Elcan GVS: Gerrit_Virtual_Submit Reviewed-by: Vaibhav Kachore Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/posix/cond.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/nvgpu/include/nvgpu/posix/cond.h b/drivers/gpu/nvgpu/include/nvgpu/posix/cond.h index 8cf4395ab..24292e7de 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/posix/cond.h +++ b/drivers/gpu/nvgpu/include/nvgpu/posix/cond.h @@ -77,7 +77,7 @@ void nvgpu_cond_unlock(struct nvgpu_cond *cond); NVGPU_COND_WAIT_TIMEOUT_LOCKED((cond), (condition), \ (cond_wait_ret), \ (cond_wait_timeout != 0U) ? \ - cond_wait_timeout : (unsigned int)-1); \ + (cond_wait_timeout) : (unsigned int)-1); \ nvgpu_mutex_release(&(cond)->mutex); \ cond_wait_ret; \ }) @@ -99,9 +99,9 @@ void nvgpu_cond_unlock(struct nvgpu_cond *cond); #define NVGPU_COND_WAIT_TIMEOUT_LOCKED(cond, condition, ret, timeout_ms)\ do { \ - unsigned int cond_wait_timeout_timeout = timeout_ms; \ + unsigned int cond_wait_timeout_timeout = (timeout_ms); \ ret = 0; \ - while (!(condition) && ret == 0) { \ + while (!(condition) && ((ret) == 0)) { \ ret = nvgpu_cond_timedwait(cond, \ &cond_wait_timeout_timeout); \ } \