From 0859cf9539841ed8e6af09472f4253e497e4248d Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 9 Nov 2016 15:53:16 -0800 Subject: gpu: nvgpu: Enable signed versus non-signed errors Fix a few trivial signed versus unsigned problems, and enable compilation flag to treat them as errors. Change-Id: I68cc327885ef1efb12db7f347a2699a65415f889 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1265291 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile.nvgpu | 4 +++- drivers/gpu/nvgpu/gk20a/clk_gk20a.c | 4 ++-- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 2 +- drivers/gpu/nvgpu/gm20b/clk_gm20b.c | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu b/drivers/gpu/nvgpu/Makefile.nvgpu index 71077386..b6420dac 100644 --- a/drivers/gpu/nvgpu/Makefile.nvgpu +++ b/drivers/gpu/nvgpu/Makefile.nvgpu @@ -9,7 +9,9 @@ ccflags-y += -I../nvgpu/drivers/gpu/nvgpu/include ccflags-y += -Wno-multichar ccflags-y += -Werror ccflags-y += -Wno-error=cpp -ccflags-y += -Wno-duplicate-decl-specifier +ifeq ($(VERSION),4) +ccflags-y += -Wextra -Wno-unused-parameter -Wno-missing-field-initializers +endif ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y) ccflags-y += -I$(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu diff --git a/drivers/gpu/nvgpu/gk20a/clk_gk20a.c b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c index e3a486b6..2c4f1bf4 100644 --- a/drivers/gpu/nvgpu/gk20a/clk_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c @@ -67,7 +67,7 @@ static int clk_config_pll(struct clk_gk20a *clk, struct pll *pll, u32 target_vco_f, vco_f; u32 ref_clk_f, target_clk_f, u_f; u32 delta, lwv, best_delta = ~0; - int pl; + unsigned int pl; BUG_ON(target_freq == NULL); @@ -160,7 +160,7 @@ static int clk_config_pll(struct clk_gk20a *clk, struct pll *pll, } found_match: - BUG_ON(best_delta == ~0); + BUG_ON(best_delta == ~0U); if (best_fit && best_delta != 0) gk20a_dbg_clk("no best match for target @ %dMHz on gpc_pll", diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 7e5984d3..b298c4c6 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -6620,7 +6620,7 @@ static int gr_gk20a_create_priv_addr_table(struct gk20a *g, u32 broadcast_flags; u32 t; int err; - u32 fbpa_num; + int fbpa_num; t = 0; *num_registers = 0; diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c index 5b3df718..25503ea1 100644 --- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c @@ -221,7 +221,7 @@ static int clk_config_pll(struct clk_gk20a *clk, struct pll *pll, } found_match: - BUG_ON(best_delta == ~0); + BUG_ON(best_delta == ~0U); if (best_fit && best_delta != 0) gk20a_dbg_clk("no best match for target @ %dMHz on gpc_pll", @@ -363,7 +363,7 @@ static void clk_config_dvfs_ndiv(int mv, u32 n_eff, struct na_dvfs *d) det_delta = det_delta * d->dfs_coeff; n = (int)(n_eff << DFS_DET_RANGE) - det_delta; - BUG_ON((n < 0) || (n > (p->max_N << DFS_DET_RANGE))); + BUG_ON((n < 0) || (n > (int)(p->max_N << DFS_DET_RANGE))); d->n_int = ((u32)n) >> DFS_DET_RANGE; rem = ((u32)n) & ((1 << DFS_DET_RANGE) - 1); -- cgit v1.2.2