summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp106/clk_gp106.c
diff options
context:
space:
mode:
authorNicolas Benech <nbenech@nvidia.com>2018-08-27 10:56:19 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-09-07 00:33:41 -0400
commit0e58ebaae13dd59b6aba5297f898e7c89fcd2742 (patch)
treea012357b1f9d3a5007c192c7e1377759f71a5a10 /drivers/gpu/nvgpu/gp106/clk_gp106.c
parent034e23c197541e0e8ac6a4d95b1d3b6d1be885cd (diff)
gpu: nvgpu: Fix nvgpu_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_readl. JIRA NVGPU-677 Change-Id: I432197cca67a10281dfe407aa9ce2dd8120030f0 Signed-off-by: Nicolas Benech <nbenech@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1807528 Reviewed-by: Automatic_Commit_Validation_User 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>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/clk_gp106.c')
-rw-r--r--drivers/gpu/nvgpu/gp106/clk_gp106.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c
index 13a401f0..e892ceda 100644
--- a/drivers/gpu/nvgpu/gp106/clk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c
@@ -188,7 +188,7 @@ u32 gp106_get_rate_cntr(struct gk20a *g, struct namemap_cfg *c)
188 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_enable_deasserted_f()); 188 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_enable_deasserted_f());
189 189
190 /* Force wb() */ 190 /* Force wb() */
191 gk20a_readl(g, c->cntr.reg_ctrl_addr); 191 (void) gk20a_readl(g, c->cntr.reg_ctrl_addr);
192 192
193 /* Wait for reset to happen */ 193 /* Wait for reset to happen */
194 retries = CLK_DEFAULT_CNTRL_SETTLE_RETRIES; 194 retries = CLK_DEFAULT_CNTRL_SETTLE_RETRIES;
@@ -209,7 +209,7 @@ u32 gp106_get_rate_cntr(struct gk20a *g, struct namemap_cfg *c)
209 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_write_en_asserted_f() | 209 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_write_en_asserted_f() |
210 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_noofipclks_f(XTAL_CNTR_CLKS) | 210 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_noofipclks_f(XTAL_CNTR_CLKS) |
211 c->cntr.reg_ctrl_idx); 211 c->cntr.reg_ctrl_idx);
212 gk20a_readl(g, c->cntr.reg_ctrl_addr); 212 (void) gk20a_readl(g, c->cntr.reg_ctrl_addr);
213 213
214 nvgpu_udelay(XTAL_CNTR_DELAY); 214 nvgpu_udelay(XTAL_CNTR_DELAY);
215 215
@@ -220,9 +220,9 @@ read_err:
220 gk20a_writel(g, c->cntr.reg_ctrl_addr, 220 gk20a_writel(g, c->cntr.reg_ctrl_addr,
221 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_reset_asserted_f() | 221 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_reset_asserted_f() |
222 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_enable_deasserted_f()); 222 trim_gpc_bcast_clk_cntr_ncgpcclk_cfg_enable_deasserted_f());
223 gk20a_readl(g, c->cntr.reg_ctrl_addr); 223 (void) gk20a_readl(g, c->cntr.reg_ctrl_addr);
224 gk20a_writel(g, c->cntr.reg_ctrl_addr, save_reg); 224 gk20a_writel(g, c->cntr.reg_ctrl_addr, save_reg);
225 gk20a_readl(g, c->cntr.reg_ctrl_addr); 225 (void) gk20a_readl(g, c->cntr.reg_ctrl_addr);
226 nvgpu_mutex_release(&clk->clk_mutex); 226 nvgpu_mutex_release(&clk->clk_mutex);
227 227
228 return cntr; 228 return cntr;