From 4451cf29d46cee3415e4dce42a8f67f3cc49070c Mon Sep 17 00:00:00 2001 From: Nicolas Benech Date: Tue, 4 Sep 2018 21:38:13 -0400 Subject: gpu: nvgpu: Fix nvgpu_sim_esc_readl MISRA 17.7 violations MISRA Rule-17.7 requires the return value of all functions to be used. Fix is either to use the return value or change the function to return void. This patch contains fix for calls to nvgpu_sim_esc_readl by changing its return to void and printing an error message instead. JIRA NVGPU-677 Change-Id: I949bea253dafc316c7dfbf870eb1225b6fc5b9c3 Signed-off-by: Nicolas Benech Reviewed-on: https://git-master.nvidia.com/r/1812887 Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/sim.c | 10 +++++++--- drivers/gpu/nvgpu/common/sim_pci.c | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/sim.c b/drivers/gpu/nvgpu/common/sim.c index 8261f270..618e8ffb 100644 --- a/drivers/gpu/nvgpu/common/sim.c +++ b/drivers/gpu/nvgpu/common/sim.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "gk20a/gk20a.h" @@ -215,7 +216,7 @@ static int issue_rpc_and_wait(struct gk20a *g) return 0; } -static int nvgpu_sim_esc_readl(struct gk20a *g, +static void nvgpu_sim_esc_readl(struct gk20a *g, char *path, u32 index, u32 *data) { int err; @@ -232,9 +233,12 @@ static int nvgpu_sim_esc_readl(struct gk20a *g, err = issue_rpc_and_wait(g); - if (!err) + if (err == 0) { memcpy(data, sim_msg_param(g, data_offset), sizeof(u32)); - return err; + } else { + *data = 0xffffffff; + WARN(1, "issue_rpc_and_wait failed err=%d", err); + } } static void nvgpu_sim_init_late(struct gk20a *g) diff --git a/drivers/gpu/nvgpu/common/sim_pci.c b/drivers/gpu/nvgpu/common/sim_pci.c index edf2a401..5f2344b4 100644 --- a/drivers/gpu/nvgpu/common/sim_pci.c +++ b/drivers/gpu/nvgpu/common/sim_pci.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "gk20a/gk20a.h" @@ -183,7 +184,7 @@ static int issue_rpc_and_wait(struct gk20a *g) return 0; } -static int nvgpu_sim_esc_readl(struct gk20a *g, +static void nvgpu_sim_esc_readl(struct gk20a *g, char *path, u32 index, u32 *data) { int err; @@ -200,9 +201,12 @@ static int nvgpu_sim_esc_readl(struct gk20a *g, err = issue_rpc_and_wait(g); - if (!err) + if (err == 0) { memcpy(data, sim_msg_param(g, data_offset + 0xc), sizeof(u32)); - return err; + } else { + *data = 0xffffffff; + WARN(1, "issue_rpc_and_wait failed err=%d", err); + } } static void nvgpu_sim_init_late(struct gk20a *g) -- cgit v1.2.2