From 54805a18d6a6093db7da2d4d4a5d5a58012b7144 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 9 Aug 2018 14:23:43 -0700 Subject: gpu: nvgpu: Add missing braces in nvgpu_mem.c When built with -Wmissing-braces, compiler complains about the missing braces in nvgpu_mem_rd_n, nvgpu_mem_wr_n and nvgpu_memset. Add the braces to satisfy compiler and to fix related MISRA C violations. Change-Id: Ibe3606dc59317f8230cea57cfea8d0fe5af641d6 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1796238 Reviewed-by: svc-misra-checker GVS: Gerrit_Virtual_Submit Reviewed-by: Vinod Gopalakrishnakurup Reviewed-by: Scott Long Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/mm/nvgpu_mem.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c index 9f3b6cfa..8ba119a6 100644 --- a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c +++ b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c @@ -229,8 +229,9 @@ void nvgpu_mem_wr32(struct gk20a *g, struct nvgpu_mem *mem, u32 w, u32 data) ptr[w] = data; } else if (mem->aperture == APERTURE_VIDMEM) { nvgpu_pramin_wr_n(g, mem, w * sizeof(u32), sizeof(u32), &data); - if (!mem->skip_wmb) + if (!mem->skip_wmb) { nvgpu_wmb(); + } } else { WARN_ON("Accessing unallocated nvgpu_mem"); } @@ -255,8 +256,9 @@ void nvgpu_mem_wr_n(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, memcpy(dest, src, size); } else if (mem->aperture == APERTURE_VIDMEM) { nvgpu_pramin_wr_n(g, mem, offset, size, src); - if (!mem->skip_wmb) + if (!mem->skip_wmb) { nvgpu_wmb(); + } } else { WARN_ON("Accessing unallocated nvgpu_mem"); } @@ -280,8 +282,9 @@ void nvgpu_memset(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, u32 repeat_value = c | (c << 8) | (c << 16) | (c << 24); nvgpu_pramin_memset(g, mem, offset, size, repeat_value); - if (!mem->skip_wmb) + if (!mem->skip_wmb) { nvgpu_wmb(); + } } else { WARN_ON("Accessing unallocated nvgpu_mem"); } -- cgit v1.2.2