From 8a036c83ce953cb71bfa47b1596daa34ed2860b1 Mon Sep 17 00:00:00 2001 From: Sachin Nikam Date: Tue, 16 May 2017 14:25:38 +0530 Subject: gpu: nvgpu: fix static sparse warnings Fix below sparse warnings by making function static or including right header: - $TOP/kernel/nvgpu/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c:45:6: warning: symbol 'gp10b_init_fecs_trace_ops' was not declared. Should it be static? - $TOP/kernel/nvgpu/drivers/gpu/nvgpu/gp106/hal_gp106.c:195:5: warning: symbol 'gp106_init_gpu_characteristics' was not declared. Should it be static? - $TOP/kernel/nvgpu/drivers/gpu/nvgpu/pstate/pstate.c:175:5: warning: symbol 'pstate_construct_super' was not declared. Should it be static? - $TOP/kernel/nvgpu/drivers/gpu/nvgpu/pstate/pstate.c:195:5: warning: symbol 'pstate_construct_3x' was not declared. Should it be static? - $TOP/kernel/nvgpu/drivers/gpu/nvgpu/pstate/pstate.c:204:15: warning: symbol 'pstate_construct' was not declared. Should it be static? - $TOP/kernel/nvgpu/drivers/gpu/nvgpu/pstate/pstate.c:218:5: warning: symbol 'pstate_insert' was not declared. Should it be static? - $TOP/kernel/nvgpu/drivers/gpu/nvgpu/clk/clk_arb.c:1457:6: warning: symbol 'nvgpu_clk_arb_ioctl_event_dev' was not declared. Should it be static? - $TOP/kernel/nvgpu/drivers/gpu/nvgpu/pmgr/pmgr.c:68:5: warning: symbol 'pmgr_pwr_devices_get_power_u64' was not declared. Should it be static? - $TOP/kernel/nvgpu/drivers/gpu/nvgpu/pmgr/pmgr.c:80:5: warning: symbol 'pmgr_pwr_devices_get_current_u64' was not declared. Should it be static? - $TOP/kernel/nvgpu/drivers/gpu/nvgpu/pmgr/pmgr.c:92:5: warning: symbol 'pmgr_pwr_devices_get_voltage_u64' was not declared. Should it be static? Bug 200299572 Change-Id: I0112ba3af5b858d2ce2a37a8366dcb6be1eb688d Signed-off-by: Sachin Nikam Reviewed-on: http://git-master/r/1482866 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/clk/clk_arb.c | 2 +- drivers/gpu/nvgpu/gp106/hal_gp106.c | 2 +- drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c | 4 +++- drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.h | 4 ++-- drivers/gpu/nvgpu/pmgr/pmgr.c | 6 +++--- drivers/gpu/nvgpu/pstate/pstate.c | 8 ++++---- 6 files changed, 14 insertions(+), 12 deletions(-) (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c index 22dc6fb7..15439817 100644 --- a/drivers/gpu/nvgpu/clk/clk_arb.c +++ b/drivers/gpu/nvgpu/clk/clk_arb.c @@ -1454,7 +1454,7 @@ static int nvgpu_clk_arb_set_event_filter(struct nvgpu_clk_dev *dev, return 0; } -long nvgpu_clk_arb_ioctl_event_dev(struct file *filp, unsigned int cmd, +static long nvgpu_clk_arb_ioctl_event_dev(struct file *filp, unsigned int cmd, unsigned long arg) { struct nvgpu_clk_dev *dev = filp->private_data; diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index eeb1bdd6..f28ff45f 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c @@ -194,7 +194,7 @@ static int gp106_get_litter_value(struct gk20a *g, int value) return ret; } -int gp106_init_gpu_characteristics(struct gk20a *g) +static int gp106_init_gpu_characteristics(struct gk20a *g) { struct nvgpu_gpu_characteristics *gpu = &g->gpu_characteristics; diff --git a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c b/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c index af06b8a6..723da1a2 100644 --- a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c @@ -1,7 +1,7 @@ /* * GP10B GPU FECS traces * - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -16,6 +16,8 @@ #include "gk20a/gk20a.h" #include "gk20a/fecs_trace_gk20a.h" +#include "fecs_trace_gp10b.h" + #include #include diff --git a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.h b/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.h index 2a25f4f6..656bc551 100644 --- a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.h @@ -1,7 +1,7 @@ /* * GP10B GPU FECS traces * - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -18,6 +18,6 @@ struct gpu_ops; -int gp10b_init_fecs_trace_ops(struct gpu_ops *); +void gp10b_init_fecs_trace_ops(struct gpu_ops *); #endif diff --git a/drivers/gpu/nvgpu/pmgr/pmgr.c b/drivers/gpu/nvgpu/pmgr/pmgr.c index f4fe984c..41c69dbd 100644 --- a/drivers/gpu/nvgpu/pmgr/pmgr.c +++ b/drivers/gpu/nvgpu/pmgr/pmgr.c @@ -65,7 +65,7 @@ int pmgr_pwr_devices_get_voltage(struct gk20a *g, u32 *val) } #ifdef CONFIG_DEBUG_FS -int pmgr_pwr_devices_get_power_u64(void *data, u64 *p) +static int pmgr_pwr_devices_get_power_u64(void *data, u64 *p) { struct gk20a *g = (struct gk20a *)data; int err; @@ -77,7 +77,7 @@ int pmgr_pwr_devices_get_power_u64(void *data, u64 *p) return err; } -int pmgr_pwr_devices_get_current_u64(void *data, u64 *p) +static int pmgr_pwr_devices_get_current_u64(void *data, u64 *p) { struct gk20a *g = (struct gk20a *)data; int err; @@ -89,7 +89,7 @@ int pmgr_pwr_devices_get_current_u64(void *data, u64 *p) return err; } -int pmgr_pwr_devices_get_voltage_u64(void *data, u64 *p) +static int pmgr_pwr_devices_get_voltage_u64(void *data, u64 *p) { struct gk20a *g = (struct gk20a *)data; int err; diff --git a/drivers/gpu/nvgpu/pstate/pstate.c b/drivers/gpu/nvgpu/pstate/pstate.c index 3110239a..791832cb 100644 --- a/drivers/gpu/nvgpu/pstate/pstate.c +++ b/drivers/gpu/nvgpu/pstate/pstate.c @@ -172,7 +172,7 @@ int gk20a_init_pstate_pmu_support(struct gk20a *g) return err; } -int pstate_construct_super(struct gk20a *g, struct boardobj **ppboardobj, +static int pstate_construct_super(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *args) { struct pstate *ptmppstate = (struct pstate *)args; @@ -192,7 +192,7 @@ int pstate_construct_super(struct gk20a *g, struct boardobj **ppboardobj, return 0; } -int pstate_construct_3x(struct gk20a *g, struct boardobj **ppboardobj, +static int pstate_construct_3x(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *args) { struct boardobj *ptmpobj = (struct boardobj *)args; @@ -201,7 +201,7 @@ int pstate_construct_3x(struct gk20a *g, struct boardobj **ppboardobj, return pstate_construct_super(g, ppboardobj, size, args); } -struct pstate *pstate_construct(struct gk20a *g, void *args) +static struct pstate *pstate_construct(struct gk20a *g, void *args) { struct pstate *pstate = NULL; struct pstate *tmp = (struct pstate *)args; @@ -215,7 +215,7 @@ struct pstate *pstate_construct(struct gk20a *g, void *args) return pstate; } -int pstate_insert(struct gk20a *g, struct pstate *pstate, int index) +static int pstate_insert(struct gk20a *g, struct pstate *pstate, int index) { struct pstates *pstates = &(g->perf_pmu.pstatesobjs); int err; -- cgit v1.2.2