summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/bus
diff options
context:
space:
mode:
authorSrirangan <smadhavan@nvidia.com>2018-08-16 02:03:55 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-08-20 08:46:25 -0400
commit9e69e0cf978b53706f55ffb873e3966b4bb3a7a8 (patch)
tree2437cda373f2c37419e14b89772fb3c5f6d234e4 /drivers/gpu/nvgpu/common/bus
parentde10cedf8caca9fd01f1b85031e538843da23252 (diff)
gpu: nvgpu: common: Fix MISRA 15.6 violations
MISRA Rule-15.6 requires that all if-else blocks be enclosed in braces, including single statement blocks. Fix errors due to single statement if blocks without braces, introducing the braces. JIRA NVGPU-671 Change-Id: I599cce2af1d6cdc24efefba4ec42abfe998aec47 Signed-off-by: Srirangan <smadhavan@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1795845 Reviewed-by: Adeel Raza <araza@nvidia.com> Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/bus')
-rw-r--r--drivers/gpu/nvgpu/common/bus/bus_gm20b.c6
-rw-r--r--drivers/gpu/nvgpu/common/bus/bus_gp10b.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gm20b.c b/drivers/gpu/nvgpu/common/bus/bus_gm20b.c
index d2c4c2b7..ef5fee8c 100644
--- a/drivers/gpu/nvgpu/common/bus/bus_gm20b.c
+++ b/drivers/gpu/nvgpu/common/bus/bus_gm20b.c
@@ -53,14 +53,16 @@ int gm20b_bus_bar1_bind(struct gk20a *g, struct nvgpu_mem *bar1_inst)
53 u32 val = gk20a_readl(g, bus_bind_status_r()); 53 u32 val = gk20a_readl(g, bus_bind_status_r());
54 u32 pending = bus_bind_status_bar1_pending_v(val); 54 u32 pending = bus_bind_status_bar1_pending_v(val);
55 u32 outstanding = bus_bind_status_bar1_outstanding_v(val); 55 u32 outstanding = bus_bind_status_bar1_outstanding_v(val);
56 if (!pending && !outstanding) 56 if (!pending && !outstanding) {
57 break; 57 break;
58 }
58 59
59 nvgpu_udelay(5); 60 nvgpu_udelay(5);
60 } while (!nvgpu_timeout_expired(&timeout)); 61 } while (!nvgpu_timeout_expired(&timeout));
61 62
62 if (nvgpu_timeout_peek_expired(&timeout)) 63 if (nvgpu_timeout_peek_expired(&timeout)) {
63 err = -EINVAL; 64 err = -EINVAL;
65 }
64 66
65 return err; 67 return err;
66} 68}
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gp10b.c b/drivers/gpu/nvgpu/common/bus/bus_gp10b.c
index 11e60c53..8aa75d8d 100644
--- a/drivers/gpu/nvgpu/common/bus/bus_gp10b.c
+++ b/drivers/gpu/nvgpu/common/bus/bus_gp10b.c
@@ -50,14 +50,16 @@ int gp10b_bus_bar2_bind(struct gk20a *g, struct nvgpu_mem *bar2_inst)
50 u32 val = gk20a_readl(g, bus_bind_status_r()); 50 u32 val = gk20a_readl(g, bus_bind_status_r());
51 u32 pending = bus_bind_status_bar2_pending_v(val); 51 u32 pending = bus_bind_status_bar2_pending_v(val);
52 u32 outstanding = bus_bind_status_bar2_outstanding_v(val); 52 u32 outstanding = bus_bind_status_bar2_outstanding_v(val);
53 if (!pending && !outstanding) 53 if (!pending && !outstanding) {
54 break; 54 break;
55 }
55 56
56 nvgpu_udelay(5); 57 nvgpu_udelay(5);
57 } while (!nvgpu_timeout_expired(&timeout)); 58 } while (!nvgpu_timeout_expired(&timeout));
58 59
59 if (nvgpu_timeout_peek_expired(&timeout)) 60 if (nvgpu_timeout_peek_expired(&timeout)) {
60 err = -EINVAL; 61 err = -EINVAL;
62 }
61 63
62 return err; 64 return err;
63} 65}