diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-08-09 17:23:43 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-11 00:33:23 -0400 |
commit | 54805a18d6a6093db7da2d4d4a5d5a58012b7144 (patch) | |
tree | 5ad1a1926c3e072571b15b1151d1d9eb43a8e2b2 | |
parent | 33bad6f0126d785a9bbfd2862a9b6b9dba43e8af (diff) |
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 <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1796238
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: Scott Long <scottl@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/nvgpu_mem.c | 9 |
1 files changed, 6 insertions, 3 deletions
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) | |||
229 | ptr[w] = data; | 229 | ptr[w] = data; |
230 | } else if (mem->aperture == APERTURE_VIDMEM) { | 230 | } else if (mem->aperture == APERTURE_VIDMEM) { |
231 | nvgpu_pramin_wr_n(g, mem, w * sizeof(u32), sizeof(u32), &data); | 231 | nvgpu_pramin_wr_n(g, mem, w * sizeof(u32), sizeof(u32), &data); |
232 | if (!mem->skip_wmb) | 232 | if (!mem->skip_wmb) { |
233 | nvgpu_wmb(); | 233 | nvgpu_wmb(); |
234 | } | ||
234 | } else { | 235 | } else { |
235 | WARN_ON("Accessing unallocated nvgpu_mem"); | 236 | WARN_ON("Accessing unallocated nvgpu_mem"); |
236 | } | 237 | } |
@@ -255,8 +256,9 @@ void nvgpu_mem_wr_n(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, | |||
255 | memcpy(dest, src, size); | 256 | memcpy(dest, src, size); |
256 | } else if (mem->aperture == APERTURE_VIDMEM) { | 257 | } else if (mem->aperture == APERTURE_VIDMEM) { |
257 | nvgpu_pramin_wr_n(g, mem, offset, size, src); | 258 | nvgpu_pramin_wr_n(g, mem, offset, size, src); |
258 | if (!mem->skip_wmb) | 259 | if (!mem->skip_wmb) { |
259 | nvgpu_wmb(); | 260 | nvgpu_wmb(); |
261 | } | ||
260 | } else { | 262 | } else { |
261 | WARN_ON("Accessing unallocated nvgpu_mem"); | 263 | WARN_ON("Accessing unallocated nvgpu_mem"); |
262 | } | 264 | } |
@@ -280,8 +282,9 @@ void nvgpu_memset(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, | |||
280 | u32 repeat_value = c | (c << 8) | (c << 16) | (c << 24); | 282 | u32 repeat_value = c | (c << 8) | (c << 16) | (c << 24); |
281 | 283 | ||
282 | nvgpu_pramin_memset(g, mem, offset, size, repeat_value); | 284 | nvgpu_pramin_memset(g, mem, offset, size, repeat_value); |
283 | if (!mem->skip_wmb) | 285 | if (!mem->skip_wmb) { |
284 | nvgpu_wmb(); | 286 | nvgpu_wmb(); |
287 | } | ||
285 | } else { | 288 | } else { |
286 | WARN_ON("Accessing unallocated nvgpu_mem"); | 289 | WARN_ON("Accessing unallocated nvgpu_mem"); |
287 | } | 290 | } |