diff options
author | Baoyou Xie <baoyou.xie@linaro.org> | 2016-09-03 01:57:14 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-14 15:10:37 -0400 |
commit | 761c2e82054fda665bcdec95b9daf3d468c5fd5b (patch) | |
tree | c6a8bbc52ee979e223ef300ba815623b76157e95 | |
parent | 9ca91fdd13ad877f4a303f6fb971aecbea4b67ae (diff) |
drm/amdgpu: mark symbols static where possible
We get a few warnings when building kernel with W=1:
drivers/gpu/drm/amd/amdgpu/cz_smc.c:51:5: warning: no previous prototype for 'cz_send_msg_to_smc_async' [-Wmissing-prototypes]
drivers/gpu/drm/amd/amdgpu/cz_smc.c:143:5: warning: no previous prototype for 'cz_write_smc_sram_dword' [-Wmissing-prototypes]
drivers/gpu/drm/amd/amdgpu/iceland_smc.c:124:6: warning: no previous prototype for 'iceland_start_smc' [-Wmissing-prototypes]
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c:3926:6: warning: no previous prototype for 'gfx_v8_0_rlc_stop' [-Wmissing-prototypes]
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c:94:6: warning: no previous prototype for 'amdgpu_job_free_cb' [-Wmissing-prototypes]
....
In fact, these functions are only used in the file in which they are
declared and don't need a declaration, but can be made static.
So this patch marks these functions with 'static'.
Reviewed-by: Christian König <christian.koenig@amd.com>
Acked-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cz_smc.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 8 |
6 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c index 040993c998d4..f1c53a2b09c6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | |||
@@ -616,7 +616,7 @@ static int amdgpu_cgs_irq_put(struct cgs_device *cgs_device, unsigned src_id, un | |||
616 | return amdgpu_irq_put(adev, adev->irq.sources[src_id], type); | 616 | return amdgpu_irq_put(adev, adev->irq.sources[src_id], type); |
617 | } | 617 | } |
618 | 618 | ||
619 | int amdgpu_cgs_set_clockgating_state(struct cgs_device *cgs_device, | 619 | static int amdgpu_cgs_set_clockgating_state(struct cgs_device *cgs_device, |
620 | enum amd_ip_block_type block_type, | 620 | enum amd_ip_block_type block_type, |
621 | enum amd_clockgating_state state) | 621 | enum amd_clockgating_state state) |
622 | { | 622 | { |
@@ -637,7 +637,7 @@ int amdgpu_cgs_set_clockgating_state(struct cgs_device *cgs_device, | |||
637 | return r; | 637 | return r; |
638 | } | 638 | } |
639 | 639 | ||
640 | int amdgpu_cgs_set_powergating_state(struct cgs_device *cgs_device, | 640 | static int amdgpu_cgs_set_powergating_state(struct cgs_device *cgs_device, |
641 | enum amd_ip_block_type block_type, | 641 | enum amd_ip_block_type block_type, |
642 | enum amd_powergating_state state) | 642 | enum amd_powergating_state state) |
643 | { | 643 | { |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index f7dccb10d965..9480be45b45f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |||
@@ -431,7 +431,7 @@ static bool amdgpu_cs_try_evict(struct amdgpu_cs_parser *p, | |||
431 | return false; | 431 | return false; |
432 | } | 432 | } |
433 | 433 | ||
434 | int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p, | 434 | static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p, |
435 | struct list_head *validated) | 435 | struct list_head *validated) |
436 | { | 436 | { |
437 | struct amdgpu_bo_list_entry *lobj; | 437 | struct amdgpu_bo_list_entry *lobj; |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index ac8d40168a47..8c5807994073 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |||
@@ -91,7 +91,7 @@ void amdgpu_job_free_resources(struct amdgpu_job *job) | |||
91 | amdgpu_ib_free(job->adev, &job->ibs[i], f); | 91 | amdgpu_ib_free(job->adev, &job->ibs[i], f); |
92 | } | 92 | } |
93 | 93 | ||
94 | void amdgpu_job_free_cb(struct amd_sched_job *s_job) | 94 | static void amdgpu_job_free_cb(struct amd_sched_job *s_job) |
95 | { | 95 | { |
96 | struct amdgpu_job *job = container_of(s_job, struct amdgpu_job, base); | 96 | struct amdgpu_job *job = container_of(s_job, struct amdgpu_job, base); |
97 | 97 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/cz_smc.c b/drivers/gpu/drm/amd/amdgpu/cz_smc.c index 69ac373c4d0f..95887e484c51 100644 --- a/drivers/gpu/drm/amd/amdgpu/cz_smc.c +++ b/drivers/gpu/drm/amd/amdgpu/cz_smc.c | |||
@@ -50,7 +50,7 @@ static struct cz_smu_private_data *cz_smu_get_priv(struct amdgpu_device *adev) | |||
50 | return priv; | 50 | return priv; |
51 | } | 51 | } |
52 | 52 | ||
53 | int cz_send_msg_to_smc_async(struct amdgpu_device *adev, u16 msg) | 53 | static int cz_send_msg_to_smc_async(struct amdgpu_device *adev, u16 msg) |
54 | { | 54 | { |
55 | int i; | 55 | int i; |
56 | u32 content = 0, tmp; | 56 | u32 content = 0, tmp; |
@@ -142,7 +142,7 @@ int cz_read_smc_sram_dword(struct amdgpu_device *adev, u32 smc_address, | |||
142 | return 0; | 142 | return 0; |
143 | } | 143 | } |
144 | 144 | ||
145 | int cz_write_smc_sram_dword(struct amdgpu_device *adev, u32 smc_address, | 145 | static int cz_write_smc_sram_dword(struct amdgpu_device *adev, u32 smc_address, |
146 | u32 value, u32 limit) | 146 | u32 value, u32 limit) |
147 | { | 147 | { |
148 | int ret; | 148 | int ret; |
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index dca8b368728c..e2ed71d5fd53 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | |||
@@ -3862,7 +3862,7 @@ static void gfx_v8_0_init_pg(struct amdgpu_device *adev) | |||
3862 | } | 3862 | } |
3863 | } | 3863 | } |
3864 | 3864 | ||
3865 | void gfx_v8_0_rlc_stop(struct amdgpu_device *adev) | 3865 | static void gfx_v8_0_rlc_stop(struct amdgpu_device *adev) |
3866 | { | 3866 | { |
3867 | WREG32_FIELD(RLC_CNTL, RLC_ENABLE_F32, 0); | 3867 | WREG32_FIELD(RLC_CNTL, RLC_ENABLE_F32, 0); |
3868 | 3868 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_smc.c b/drivers/gpu/drm/amd/amdgpu/iceland_smc.c index 211839913728..ef7c27d7356a 100644 --- a/drivers/gpu/drm/amd/amdgpu/iceland_smc.c +++ b/drivers/gpu/drm/amd/amdgpu/iceland_smc.c | |||
@@ -121,7 +121,7 @@ out: | |||
121 | return result; | 121 | return result; |
122 | } | 122 | } |
123 | 123 | ||
124 | void iceland_start_smc(struct amdgpu_device *adev) | 124 | static void iceland_start_smc(struct amdgpu_device *adev) |
125 | { | 125 | { |
126 | uint32_t val = RREG32_SMC(ixSMC_SYSCON_RESET_CNTL); | 126 | uint32_t val = RREG32_SMC(ixSMC_SYSCON_RESET_CNTL); |
127 | 127 | ||
@@ -129,7 +129,7 @@ void iceland_start_smc(struct amdgpu_device *adev) | |||
129 | WREG32_SMC(ixSMC_SYSCON_RESET_CNTL, val); | 129 | WREG32_SMC(ixSMC_SYSCON_RESET_CNTL, val); |
130 | } | 130 | } |
131 | 131 | ||
132 | void iceland_reset_smc(struct amdgpu_device *adev) | 132 | static void iceland_reset_smc(struct amdgpu_device *adev) |
133 | { | 133 | { |
134 | uint32_t val = RREG32_SMC(ixSMC_SYSCON_RESET_CNTL); | 134 | uint32_t val = RREG32_SMC(ixSMC_SYSCON_RESET_CNTL); |
135 | 135 | ||
@@ -145,7 +145,7 @@ static int iceland_program_jump_on_start(struct amdgpu_device *adev) | |||
145 | return 0; | 145 | return 0; |
146 | } | 146 | } |
147 | 147 | ||
148 | void iceland_stop_smc_clock(struct amdgpu_device *adev) | 148 | static void iceland_stop_smc_clock(struct amdgpu_device *adev) |
149 | { | 149 | { |
150 | uint32_t val = RREG32_SMC(ixSMC_SYSCON_CLOCK_CNTL_0); | 150 | uint32_t val = RREG32_SMC(ixSMC_SYSCON_CLOCK_CNTL_0); |
151 | 151 | ||
@@ -153,7 +153,7 @@ void iceland_stop_smc_clock(struct amdgpu_device *adev) | |||
153 | WREG32_SMC(ixSMC_SYSCON_CLOCK_CNTL_0, val); | 153 | WREG32_SMC(ixSMC_SYSCON_CLOCK_CNTL_0, val); |
154 | } | 154 | } |
155 | 155 | ||
156 | void iceland_start_smc_clock(struct amdgpu_device *adev) | 156 | static void iceland_start_smc_clock(struct amdgpu_device *adev) |
157 | { | 157 | { |
158 | uint32_t val = RREG32_SMC(ixSMC_SYSCON_CLOCK_CNTL_0); | 158 | uint32_t val = RREG32_SMC(ixSMC_SYSCON_CLOCK_CNTL_0); |
159 | 159 | ||