gpu: nvgpu: Fix MISRA 15.6 violations

MISRA Rule-15.6 requires that all loop bodies must be enclosed in braces
including single statement loop bodies. This patch fix the MISRA
violations due to single statement loop bodies without braces by adding
them.

JIRA NVGPU-989

Change-Id: If79f56f92b94d0114477b66a6f654ac16ee8ea27
Signed-off-by: Srirangan <smadhavan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1791194
Reviewed-by: Adeel Raza <araza@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 22 insertions, 12 deletions

diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h
index 912c2c98..3c28963c 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h
@@ -376,8 +376,9 @@ void boardobjgrpe32hdrset(struct nv_pmu_boardobjgrp *hdr, u32 objmask);
 #define HIGHESTBITIDX_32(n32)   \
 {                               \
         u32 count = 0;        \
-        while (n32 >>= 1)       \
-                count++;        \
+        while (n32 >>= 1) {       \
+                count++;       \
+        }                      \
         n32 = count;            \
 }
 
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c
index 93befc99..849abe16 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -63,8 +63,9 @@ u32 boardobjgrpmask_import(struct boardobjgrpmask *mask, u8 bitsize,
         if (mask->bitcount != bitsize)
                 return -EINVAL;
 
-        for (index = 0; index < mask->maskdatacount; index++)
+        for (index = 0; index < mask->maskdatacount; index++) {
                 mask->data[index] = extmask->data[index];
+        }
 
         BOARDOBJGRPMASK_NORMALIZE(mask);
 
@@ -83,8 +84,9 @@ u32 boardobjgrpmask_export(struct boardobjgrpmask *mask, u8 bitsize,
         if (mask->bitcount != bitsize)
                 return -EINVAL;
 
-        for (index = 0; index < mask->maskdatacount; index++)
+        for (index = 0; index < mask->maskdatacount; index++) {
                 extmask->data[index] = mask->data[index];
+        }
 
         return 0;
 }
@@ -95,8 +97,9 @@ u32 boardobjgrpmask_clr(struct boardobjgrpmask *mask)
 
         if (mask == NULL)
                 return -EINVAL;
-        for (index = 0; index < mask->maskdatacount; index++)
+        for (index = 0; index < mask->maskdatacount; index++) {
                 mask->data[index] = 0;
+        }
 
         return 0;
 }
@@ -107,8 +110,9 @@ u32 boardobjgrpmask_set(struct boardobjgrpmask *mask)
 
         if (mask == NULL)
                 return -EINVAL;
-        for (index = 0; index < mask->maskdatacount; index++)
+        for (index = 0; index < mask->maskdatacount; index++) {
                 mask->data[index] = 0xFFFFFFFF;
+        }
         BOARDOBJGRPMASK_NORMALIZE(mask);
         return 0;
 }
@@ -119,8 +123,9 @@ u32 boardobjgrpmask_inv(struct boardobjgrpmask *mask)
 
         if (mask == NULL)
                 return -EINVAL;
-        for (index = 0; index < mask->maskdatacount; index++)
+        for (index = 0; index < mask->maskdatacount; index++) {
                 mask->data[index] = ~mask->data[index];
+        }
         BOARDOBJGRPMASK_NORMALIZE(mask);
         return 0;
 }
@@ -281,8 +286,9 @@ u32 boardobjgrpmask_and(struct boardobjgrpmask *dst,
         if (!boardobjgrpmask_sizeeq(dst, op2))
                 return -EINVAL;
 
-        for (index = 0; index < dst->maskdatacount; index++)
+        for (index = 0; index < dst->maskdatacount; index++) {
                 dst->data[index] = op1->data[index] & op2->data[index];
+        }
 
         return 0;
 }
@@ -298,8 +304,9 @@ u32 boardobjgrpmask_or(struct boardobjgrpmask *dst,
         if (!boardobjgrpmask_sizeeq(dst, op2))
                 return -EINVAL;
 
-        for (index = 0; index < dst->maskdatacount; index++)
+        for (index = 0; index < dst->maskdatacount; index++) {
                 dst->data[index] = op1->data[index] | op2->data[index];
+        }
 
         return 0;
 }
@@ -315,8 +322,9 @@ u32 boardobjgrpmask_xor(struct boardobjgrpmask *dst,
         if (!boardobjgrpmask_sizeeq(dst, op2))
                 return -EINVAL;
 
-        for (index = 0; index < dst->maskdatacount; index++)
+        for (index = 0; index < dst->maskdatacount; index++) {
                 dst->data[index] = op1->data[index] ^ op2->data[index];
+        }
 
         return 0;
 }
@@ -329,8 +337,9 @@ u32 boardobjgrpmask_copy(struct boardobjgrpmask *dst,
         if (!boardobjgrpmask_sizeeq(dst, src))
                 return -EINVAL;
 
-        for (index = 0; index < dst->maskdatacount; index++)
+        for (index = 0; index < dst->maskdatacount; index++) {
                 dst->data[index] = src->data[index];
+        }
 
         return 0;
 }